OSDN Git Service
Andreas Gampe [Sat, 13 Jun 2015 03:48:42 +0000 (03:48 +0000)]
am
d504ec42: Merge "ART: Fix CFI test wrt/ PIC"
* commit '
d504ec4272853f37e20891944c41bad8232d13fc':
ART: Fix CFI test wrt/ PIC
Andreas Gampe [Sat, 13 Jun 2015 03:40:56 +0000 (03:40 +0000)]
Merge "ART: Fix CFI test wrt/ PIC"
Andreas Gampe [Sat, 13 Jun 2015 03:38:49 +0000 (20:38 -0700)]
ART: Fix CFI test wrt/ PIC
PIC boot images can't be loaded with dlopen, as their base is zero,
but we have an expectant address. Turn off in-process unwinding
in 137-cfi by checking the boot image oat file type.
Keep a non-owned referenced to the oat file in image space to simplify
access.
Change-Id: Ia2b525f9b2ecbc80b433f09e04ebece4cb6f2d2b
Mathieu Chartier [Sat, 13 Jun 2015 01:02:35 +0000 (01:02 +0000)]
am
dbef9aa7: Merge "Pass reuse flag to MemMap constructor"
* commit '
dbef9aa7439facbe9efdcb6ad1522857b5b3a398':
Pass reuse flag to MemMap constructor
Mathieu Chartier [Sat, 13 Jun 2015 00:53:10 +0000 (00:53 +0000)]
Merge "Pass reuse flag to MemMap constructor"
Dmitriy Ivanov [Sat, 13 Jun 2015 00:52:59 +0000 (00:52 +0000)]
am
28c25d2b: Merge "Let classloader provide correct LD_LIBRARY_PATH"
* commit '
28c25d2bdf71ec5e7fecb6db1ee82ef2af386dbe':
Let classloader provide correct LD_LIBRARY_PATH
Dmitriy Ivanov [Sat, 13 Jun 2015 00:43:56 +0000 (00:43 +0000)]
Merge "Let classloader provide correct LD_LIBRARY_PATH"
Mathieu Chartier [Sat, 13 Jun 2015 00:32:31 +0000 (17:32 -0700)]
Pass reuse flag to MemMap constructor
Bug:
21806978
Change-Id: Iec92220d8f42e1d702ee39b27a8de570ea1ab588
David Srbecky [Fri, 12 Jun 2015 23:12:44 +0000 (23:12 +0000)]
am
4366369f: Merge "Use dlopen to load oat files."
* commit '
4366369f1151cd703073f805036793e2f7255571':
Use dlopen to load oat files.
David Srbecky [Fri, 12 Jun 2015 23:04:49 +0000 (23:04 +0000)]
Merge "Use dlopen to load oat files."
David Srbecky [Thu, 11 Jun 2015 16:38:44 +0000 (17:38 +0100)]
Use dlopen to load oat files.
This is required to support in-process unwinding in libunwind.
libunwind obtains the list of loaded libraries from the linker,
therefore we need to use dlopen, otherwise it will not find them.
Change-Id: I5fd89cce6b909385cb89b8a48c0d817677acf299
Sebastien Hertz [Fri, 12 Jun 2015 17:51:18 +0000 (17:51 +0000)]
am
fff9d01c: Merge "JDWP: update handling of 8-bit and 16-bit fields"
* commit '
fff9d01c05df3090569481cf244b5c28c9d0eac2':
JDWP: update handling of 8-bit and 16-bit fields
Sebastien Hertz [Fri, 12 Jun 2015 17:38:21 +0000 (17:38 +0000)]
Merge "JDWP: update handling of 8-bit and 16-bit fields"
Sebastien Hertz [Thu, 11 Jun 2015 16:42:58 +0000 (18:42 +0200)]
JDWP: update handling of 8-bit and 16-bit fields
We must use special getter/setter for types smaller than int:
boolean, byte, char and short. However, JDWP still requires to treat:
- int and float as 32-bit values
- long and double as 64-bit values
Bug:
21746739
Change-Id: I8d0ce46246084c9e16f287da28d8969d36b83b99
Calin Juravle [Fri, 12 Jun 2015 16:28:08 +0000 (16:28 +0000)]
am
ff924fb2: Merge "Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""""
* commit '
ff924fb2700decce131fb10dd28de1e251465792':
Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
Calin Juravle [Fri, 12 Jun 2015 16:28:04 +0000 (16:28 +0000)]
am
2a023030: Merge "Revert "Revert "Revert "Fix a checker test""""
* commit '
2a023030d5e7d6e580ab41d6623ae86c9e5a28b9':
Revert "Revert "Revert "Fix a checker test"""
Calin Juravle [Fri, 12 Jun 2015 16:28:00 +0000 (16:28 +0000)]
am
c0c2be30: Merge "Revert "Revert "Fix a checker test"""
* commit '
c0c2be30bfba0daed9e1a5ea7b67afb03253ae27':
Revert "Revert "Fix a checker test""
Calin Juravle [Fri, 12 Jun 2015 16:27:58 +0000 (16:27 +0000)]
am
ec632a92: Merge "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
* commit '
ec632a921bc7b867574c36f3e2c57020da0a50c9':
Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""
Sergio Giro [Fri, 12 Jun 2015 16:27:54 +0000 (16:27 +0000)]
am
93192e73: Merge "tools/buildbot-build.sh: Remove javalibcoretest from common targets"
* commit '
93192e73ac80de28344699695712311a4d8627f2':
tools/buildbot-build.sh: Remove javalibcoretest from common targets
Calin Juravle [Fri, 12 Jun 2015 15:40:57 +0000 (15:40 +0000)]
Merge "Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""""
Calin Juravle [Fri, 12 Jun 2015 15:40:42 +0000 (15:40 +0000)]
Revert "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
This reverts commit
a981f9d5cac9a479d3b5d16508d71cfe17d95117.
Change-Id: I69faf16d5ef0ecc234fb52e071b682e728a8bf97
Calin Juravle [Fri, 12 Jun 2015 15:40:13 +0000 (15:40 +0000)]
Merge "Revert "Revert "Revert "Fix a checker test""""
Calin Juravle [Fri, 12 Jun 2015 15:39:26 +0000 (15:39 +0000)]
Revert "Revert "Revert "Fix a checker test"""
This reverts commit
b9610e795b8df7b3ba8c6b2c38d6589c2a0e5321.
Change-Id: Id4550d578913a7eac02480b635b3c0a44dea2b4c
Calin Juravle [Fri, 12 Jun 2015 15:26:57 +0000 (15:26 +0000)]
Merge "Revert "Revert "Fix a checker test"""
Calin Juravle [Fri, 12 Jun 2015 15:26:45 +0000 (15:26 +0000)]
Revert "Revert "Fix a checker test""
This reverts commit
e27dd0ef36f225e9d52daa454b8030f3d485b982.
Change-Id: I7779ec9273cd9873828f31706ddaee3bc707be24
Calin Juravle [Fri, 12 Jun 2015 15:26:32 +0000 (15:26 +0000)]
Merge "Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types"""
Calin Juravle [Fri, 12 Jun 2015 15:26:21 +0000 (15:26 +0000)]
Revert "Revert "Bring ReferenceTypePropagation to HInvoke return types""
This reverts commit
958857d0f9686770a3b1117166d5fa700b39704a.
Change-Id: I196ff2a4453489f0105efc54eee73a2a9321ac4e
Sergio Giro [Fri, 12 Jun 2015 14:30:08 +0000 (14:30 +0000)]
Merge "tools/buildbot-build.sh: Remove javalibcoretest from common targets"
Sergio Giro [Fri, 12 Jun 2015 14:18:48 +0000 (14:18 +0000)]
am
d26d13c7: Merge "art/tools: add new tests in security packages to the build bot"
* commit '
d26d13c79a2a974eb49ca77537e9107fef904c30':
art/tools: add new tests in security packages to the build bot
Sergio Giro [Fri, 12 Jun 2015 14:16:26 +0000 (15:16 +0100)]
tools/buildbot-build.sh: Remove javalibcoretest from common targets
It's built in the make command
Change-Id: I702d54c38dd4492e19688d3949c1e610865d9260
Vladimir Marko [Fri, 12 Jun 2015 14:13:05 +0000 (14:13 +0000)]
am
b2ece2fe: Merge "Optimizing: Move optimization objects to Arena."
* commit '
b2ece2fe386ed346a74824e2e47810b805a0c4cb':
Optimizing: Move optimization objects to Arena.
Sergio Giro [Fri, 12 Jun 2015 14:11:51 +0000 (14:11 +0000)]
Merge "art/tools: add new tests in security packages to the build bot"
Sergio Giro [Fri, 12 Jun 2015 11:35:51 +0000 (12:35 +0100)]
art/tools: add new tests in security packages to the build bot
Otherwise, it's difficult to know when they start to fail
Test packages added:
com.android.org.conscrypt
libcore.java.security
libcore.javax.net
Bug:
21722374
Change-Id: Ifc641d06a9a0e6ba23fbcb11f49025b8213351fe
Vladimir Marko [Fri, 12 Jun 2015 14:02:47 +0000 (14:02 +0000)]
Merge "Optimizing: Move optimization objects to Arena."
Vladimir Marko [Fri, 12 Jun 2015 13:30:53 +0000 (14:30 +0100)]
Optimizing: Move optimization objects to Arena.
This should reduce the stack size needed by the
OptimizingCompiler::CompileOptimized() which was very
close to our limits for clang builds, causing repeated
build breakages on otherwise healthy changes:
art/compiler/optimizing/optimizing_compiler.cc:395:37:
error: stack frame size of 1760 bytes in function
'art::OptimizingCompiler::CompileOptimized'
[-Werror,-Wframe-larger-than=]
Change-Id: I2f4ab0235f4eac61823a4a320bb4fe78942a23c2
Nicolas Geoffray [Fri, 12 Jun 2015 13:48:36 +0000 (13:48 +0000)]
am
67b9e9cd: Merge "Fix a typo in the directory name."
* commit '
67b9e9cd8d84f64ef89895b7af5a52f3d15bb1de':
Fix a typo in the directory name.
Nicolas Geoffray [Fri, 12 Jun 2015 13:40:12 +0000 (13:40 +0000)]
Merge "Fix a typo in the directory name."
Nicolas Geoffray [Fri, 12 Jun 2015 13:39:17 +0000 (14:39 +0100)]
Fix a typo in the directory name.
Change-Id: Ie059e61142f9b5c9c6b86550995db14d5706fc9a
Nicolas Geoffray [Fri, 12 Jun 2015 12:25:27 +0000 (12:25 +0000)]
am
10176757: Merge "Preserve class loading semantics in optimizing."
* commit '
10176757836db987e11fb3723e4cb07bd9ea7e95':
Preserve class loading semantics in optimizing.
Calin Juravle [Fri, 12 Jun 2015 12:25:25 +0000 (12:25 +0000)]
am
ee1264bd: Merge "Revert "Bring ReferenceTypePropagation to HInvoke return types""
* commit '
ee1264bd21c76a2020693753d39f50765d84a2cf':
Revert "Bring ReferenceTypePropagation to HInvoke return types"
Calin Juravle [Fri, 12 Jun 2015 12:25:24 +0000 (12:25 +0000)]
am
f0bb3a6b: Merge "Revert "Fix a checker test""
* commit '
f0bb3a6ba464afd5cc00ebf699317a65aaa6e987':
Revert "Fix a checker test"
Nicolas Geoffray [Fri, 12 Jun 2015 12:15:30 +0000 (12:15 +0000)]
Merge "Preserve class loading semantics in optimizing."
Calin Juravle [Fri, 12 Jun 2015 12:14:12 +0000 (12:14 +0000)]
Merge "Revert "Bring ReferenceTypePropagation to HInvoke return types""
Calin Juravle [Fri, 12 Jun 2015 12:13:43 +0000 (12:13 +0000)]
Revert "Bring ReferenceTypePropagation to HInvoke return types"
We exceed stack frame size with Clang in art::OptimizingCompiler::CompileOptimized
This reverts commit
ddedddcedaae78fc6aa29940fdb1fbe40bb05774.
Change-Id: I6f992dda228acb9cae2087d1e6c78f2afdf30050
Calin Juravle [Fri, 12 Jun 2015 12:13:22 +0000 (12:13 +0000)]
Merge "Revert "Fix a checker test""
Calin Juravle [Fri, 12 Jun 2015 12:13:10 +0000 (12:13 +0000)]
Revert "Fix a checker test"
We exceed stack frame size with Clang in art::OptimizingCompiler::CompileOptimized
This reverts commit
240d84d5b8fbfedef5fee45b490042b9c66bd6f6.
Change-Id: I6a5717682cbc5e6345399da8c1503fd736764ac7
Nicolas Geoffray [Fri, 12 Jun 2015 11:55:07 +0000 (11:55 +0000)]
am
b684aa93: Merge "Explicitly give the path of the library to build."
* commit '
b684aa939bd17cb43ef6ebdb7b89d175c38c79f0':
Explicitly give the path of the library to build.
Nicolas Geoffray [Fri, 12 Jun 2015 11:43:05 +0000 (11:43 +0000)]
Merge "Explicitly give the path of the library to build."
Nicolas Geoffray [Fri, 12 Jun 2015 11:41:42 +0000 (12:41 +0100)]
Explicitly give the path of the library to build.
Otherwise the build system would not build the 32bit version
for ART 32 bit.
Change-Id: Ie2b48bb94d4fc9ce1a9590c1e8bacd382db16d8c
Vladimir Marko [Fri, 12 Jun 2015 11:12:30 +0000 (11:12 +0000)]
am
5dcdf94a: Merge "Optimizing: Remove PcInfo, use the StackMapStream instead."
* commit '
5dcdf94a7f41cde71b5d15aab66be067ab8bee3f':
Optimizing: Remove PcInfo, use the StackMapStream instead.
Vladimir Marko [Fri, 12 Jun 2015 11:06:05 +0000 (11:06 +0000)]
Merge "Optimizing: Remove PcInfo, use the StackMapStream instead."
Sebastien Hertz [Fri, 12 Jun 2015 10:48:57 +0000 (10:48 +0000)]
am
42361f2e: Merge "JDWP: asynchronous invoke command handling"
* commit '
42361f2e8b3601813dc40d12e14c679df99a864b':
JDWP: asynchronous invoke command handling
Sebastien Hertz [Fri, 12 Jun 2015 10:40:56 +0000 (10:40 +0000)]
Merge "JDWP: asynchronous invoke command handling"
Calin Juravle [Fri, 12 Jun 2015 10:06:56 +0000 (10:06 +0000)]
am
995f6e23: Merge "Fix a checker test"
* commit '
995f6e23418a1b4058167e64bbe50fd9e5dc7f02':
Fix a checker test
Calin Juravle [Fri, 12 Jun 2015 09:59:14 +0000 (09:59 +0000)]
Merge "Fix a checker test"
Calin Juravle [Fri, 12 Jun 2015 09:57:04 +0000 (10:57 +0100)]
Fix a checker test
Change-Id: I47a24352922ab32d4a07d6d32b5126d03c8f497f
Nicolas Geoffray [Fri, 12 Jun 2015 08:35:05 +0000 (09:35 +0100)]
Preserve class loading semantics in optimizing.
We were being too agressive in removing HLoadClass instructions.
A HInvokeStaticOrDirect can only remove it if it's directly before it.
bug:
21711097
Change-Id: Id63502d90e11da60eccfb46daca62e0d5d022119
Calin Juravle [Fri, 12 Jun 2015 09:48:47 +0000 (09:48 +0000)]
am
6ab9edbc: Merge "Bring ReferenceTypePropagation to HInvoke return types"
* commit '
6ab9edbc4e55fda54ad0c39d5606e2c145b56bf5':
Bring ReferenceTypePropagation to HInvoke return types
Calin Juravle [Fri, 12 Jun 2015 09:38:51 +0000 (09:38 +0000)]
Merge "Bring ReferenceTypePropagation to HInvoke return types"
Nicolas Geoffray [Fri, 12 Jun 2015 09:36:43 +0000 (09:36 +0000)]
am
3d4e3b93: Merge "Add libjavacoretests.so to the things to build."
* commit '
3d4e3b93e11a8c8658a6498aed77e3b28b55bc86':
Add libjavacoretests.so to the things to build.
Vladimir Marko [Fri, 12 Jun 2015 09:06:32 +0000 (10:06 +0100)]
Optimizing: Remove PcInfo, use the StackMapStream instead.
Change-Id: I474f3a89f6c7ee5c7accd21791b1c1e311104158
Nicolas Geoffray [Fri, 12 Jun 2015 09:24:30 +0000 (09:24 +0000)]
Merge "Add libjavacoretests.so to the things to build."
Nicolas Geoffray [Fri, 12 Jun 2015 09:23:30 +0000 (10:23 +0100)]
Add libjavacoretests.so to the things to build.
Needed for runing dalvik.system tests.
Change-Id: I6bd08b436bd560bff946586802028ab386bc6ec8
Nicolas Geoffray [Fri, 12 Jun 2015 08:06:43 +0000 (08:06 +0000)]
am
edc0e4f3: Merge "Add dalvik.system to run-libcore-tests.sh"
* commit '
edc0e4f317bd110dfd774fd1c42d7455763820d9':
Add dalvik.system to run-libcore-tests.sh
Nicolas Geoffray [Fri, 12 Jun 2015 07:55:49 +0000 (07:55 +0000)]
Merge "Add dalvik.system to run-libcore-tests.sh"
Nicolas Geoffray [Fri, 12 Jun 2015 07:54:59 +0000 (07:54 +0000)]
am
c19c9e8b: Merge "Don\'t run 098-ddmc, it\'s flaky."
* commit '
c19c9e8b5719fe50eeace1ef185700ad3071e877':
Don't run 098-ddmc, it's flaky.
Nicolas Geoffray [Fri, 12 Jun 2015 07:46:30 +0000 (07:46 +0000)]
Merge "Don't run 098-ddmc, it's flaky."
Nicolas Geoffray [Fri, 12 Jun 2015 07:38:20 +0000 (08:38 +0100)]
Don't run 098-ddmc, it's flaky.
Change-Id: I3fa559f84b2c3a1ce9b07b8d3a27723dc84b3a3e
Brian Carlstrom [Thu, 11 Jun 2015 14:33:51 +0000 (07:33 -0700)]
Add dalvik.system to run-libcore-tests.sh
Change-Id: I64c5dfb7fbb0c337befb57e2d7bebc14b022cf85
Mathieu Chartier [Fri, 12 Jun 2015 01:10:57 +0000 (01:10 +0000)]
am
bb6a5557: Merge "Skip 098-ddmc for GC stress test"
* commit '
bb6a5557fc63283111b3145d36c09a97fc99fa4e':
Skip 098-ddmc for GC stress test
Mathieu Chartier [Fri, 12 Jun 2015 00:59:40 +0000 (00:59 +0000)]
Merge "Skip 098-ddmc for GC stress test"
Man Cao [Thu, 11 Jun 2015 22:55:43 +0000 (15:55 -0700)]
Skip 098-ddmc for GC stress test
And add comment about the temporary fix in 098-ddmc because of behavior
change for DDMS's getRecentAllocations().
Also fixed a buggy typo in Android.run-test.mk.
Bug:
20037135
Change-Id: Ia57e03f458d8570690616d2cc49f2ead42a96cb0
Mathieu Chartier [Fri, 12 Jun 2015 00:24:59 +0000 (00:24 +0000)]
am
f1b5a27e: Merge "Fix compaction bug in Class_getDeclaredMethodsUnchecked"
* commit '
f1b5a27e2619cea728fcf92fd7901c71ebd9ed28':
Fix compaction bug in Class_getDeclaredMethodsUnchecked
Mathieu Chartier [Fri, 12 Jun 2015 00:16:23 +0000 (00:16 +0000)]
Merge "Fix compaction bug in Class_getDeclaredMethodsUnchecked"
Mathieu Chartier [Thu, 11 Jun 2015 23:21:42 +0000 (16:21 -0700)]
Fix compaction bug in Class_getDeclaredMethodsUnchecked
Added handle to fix the bug.
(cherry picked from commit
b89a8c66e360575d2dc1ec1229235735c56968ff)
Bug:
21638351
Change-Id: I1c3abea33aa825d3a28c1fc5cb415508686ad93e
Mathieu Chartier [Thu, 11 Jun 2015 22:27:59 +0000 (22:27 +0000)]
am
8d73a91d: Merge "Move image intern table into image"
* commit '
8d73a91d8f4c89ac152d18081b07093f68c56a11':
Move image intern table into image
Mathieu Chartier [Thu, 11 Jun 2015 22:20:08 +0000 (22:20 +0000)]
Merge "Move image intern table into image"
Mathieu Chartier [Wed, 10 Jun 2015 00:50:29 +0000 (17:50 -0700)]
Move image intern table into image
Previously we recreated this intern table during runtime startup.
This added 50-100ms of boot time.
Fixed bug where we didn't copy over hashcodes into the image.
Deleted some stale code.
(cherry picked from commit
fac3a390a247fe33d4873773d742aad4cc100118)
Bug:
20727525
Bug:
19569780
Change-Id: I08959e9aa2a73cedb52f393033e2ffea3a26e76b
Hiroshi Yamauchi [Thu, 11 Jun 2015 21:55:30 +0000 (21:55 +0000)]
am
cff58550: Merge "Reset GC performance stats at zygote fork."
* commit '
cff585503ff45a75315b00bdedd4db4bce7b426f':
Reset GC performance stats at zygote fork.
Hiroshi Yamauchi [Thu, 11 Jun 2015 21:46:50 +0000 (21:46 +0000)]
Merge "Reset GC performance stats at zygote fork."
Hiroshi Yamauchi [Thu, 11 Jun 2015 00:20:54 +0000 (17:20 -0700)]
Reset GC performance stats at zygote fork.
So GCs before a zygote fork won't be attributed to an app.
(cherry pick commit Ib37bc587e0f039ef8faeabe63dec19de49501863)
Bug:
21491908
Change-Id: Ib37bc587e0f039ef8faeabe63dec19de49501863
Mathieu Chartier [Thu, 11 Jun 2015 20:29:52 +0000 (20:29 +0000)]
am
15306dcd: Merge "Add hprof accounting for Class IMT, VTable"
* commit '
15306dcd03208f062737239753ab1eccfe91403f':
Add hprof accounting for Class IMT, VTable
Mathieu Chartier [Thu, 11 Jun 2015 20:23:23 +0000 (20:23 +0000)]
Merge "Add hprof accounting for Class IMT, VTable"
Mathieu Chartier [Wed, 3 Jun 2015 23:51:09 +0000 (16:51 -0700)]
Add hprof accounting for Class IMT, VTable
These are now included in the classOverhead field which used to be
the staticOverhead field.
Bug:
20726205
Change-Id: I648db1bcaa393e3e907b1878f29631ad6b14a6e7
Igor Murashkin [Thu, 11 Jun 2015 18:55:10 +0000 (18:55 +0000)]
am
79b08e69: Merge "runtime: Minor cleanup and extra comments around interpreter"
* commit '
79b08e69b71a53beb3f053b304c34ea88bfb9a47':
runtime: Minor cleanup and extra comments around interpreter
Igor Murashkin [Thu, 11 Jun 2015 18:46:20 +0000 (18:46 +0000)]
Merge "runtime: Minor cleanup and extra comments around interpreter"
Igor Murashkin [Wed, 10 Jun 2015 22:56:42 +0000 (15:56 -0700)]
runtime: Minor cleanup and extra comments around interpreter
Change-Id: I24c0b261de8cf737babd9d01bf679482d48c8bc9
Dmitriy Ivanov [Fri, 5 Jun 2015 20:01:52 +0000 (13:01 -0700)]
Let classloader provide correct LD_LIBRARY_PATH
Rely on BaseDexClassLoader to provide correct LD_LIBRARY_PATH
Bug: http://b/
21647354
Bug: http://b/
21667767
Bug: http://b/
8076853
Change-Id: I8c690a2578d5de43be9da964fa5a4c0246aa6eec
(cherry picked from commit
8117250a0bb57bf2aa6b1ab0c7d4d4a7dd402c08)
Mathieu Chartier [Thu, 11 Jun 2015 17:19:09 +0000 (17:19 +0000)]
am
9fb3e66a: Merge "Fix buildbot failure for 098-ddmc test"
* commit '
9fb3e66a08c779f55d22174d079ecd58fd8b8bc3':
Fix buildbot failure for 098-ddmc test
Mathieu Chartier [Thu, 11 Jun 2015 17:12:07 +0000 (17:12 +0000)]
Merge "Fix buildbot failure for 098-ddmc test"
Sergio Giro [Thu, 11 Jun 2015 16:07:54 +0000 (16:07 +0000)]
am
18af0bf1: Merge "Revert "art/tools: add new tests in security packages to the build bot""
* commit '
18af0bf15a43c0a358971d370194f18b09e87c99':
Revert "art/tools: add new tests in security packages to the build bot"
Sergio Giro [Thu, 11 Jun 2015 16:00:54 +0000 (16:00 +0000)]
Merge "Revert "art/tools: add new tests in security packages to the build bot""
Sergio Giro [Thu, 11 Jun 2015 16:00:11 +0000 (16:00 +0000)]
Revert "art/tools: add new tests in security packages to the build bot"
This reverts commit
7904aba5f8ab73c12e83f8e786556c0c77306810.
Change-Id: I06d81bbe415999933cc73d8431a1ceb72bbdc132
Sergio Giro [Thu, 11 Jun 2015 14:04:32 +0000 (14:04 +0000)]
am
cb0c4c38: Merge "art/tools: add new tests in security packages to the build bot"
* commit '
cb0c4c38a0a991ffceab23546674cde084851805':
art/tools: add new tests in security packages to the build bot
Sergio Giro [Thu, 11 Jun 2015 13:54:59 +0000 (13:54 +0000)]
Merge "art/tools: add new tests in security packages to the build bot"
Sergio Giro [Wed, 10 Jun 2015 12:32:07 +0000 (13:32 +0100)]
art/tools: add new tests in security packages to the build bot
Otherwise, it's difficult to know when they start to fail
Test packages added:
com.android.org.conscrypt
libcore.java.security
libcore.javax.net
Bug:
21722374
Change-Id: I45e91239c5f8633943c515cc39978e4ee652ec3c
Narayan Kamath [Thu, 11 Jun 2015 09:40:35 +0000 (09:40 +0000)]
am
8d868430: Merge "Fix build breakage in dwarf_test."
* commit '
8d86843064912299b71191eabe65ce16fa7f3099':
Fix build breakage in dwarf_test.
Narayan Kamath [Thu, 11 Jun 2015 07:59:46 +0000 (07:59 +0000)]
Merge "Fix build breakage in dwarf_test."
Narayan Kamath [Thu, 11 Jun 2015 07:49:57 +0000 (08:49 +0100)]
Fix build breakage in dwarf_test.
Define a variable only if it's going to be used.
Change-Id: Id293f79bf986c79fb33daa3242388303c0fb1f08
Man Cao [Thu, 11 Jun 2015 03:02:42 +0000 (20:02 -0700)]
Fix buildbot failure for 098-ddmc test
The test only failed on buildbot but not on my local machine. It is
possibly caused by GC reclaiming dead objects and associated allocation
records.
More importantly, the CL 153435 changes the behavior of recent allocation
tracking for DDMS, so that it now reports allocation records of not-yet-
garbaged-collected objects. They are a superset of live objects, but not
a precise set of the most recent allocations.
Bug:
20037135
Change-Id: I200a6c8baaeb98207845049902d59efa2f4ea11e