OSDN Git Service
Sebastien Hertz [Fri, 12 Jun 2015 13:32:27 +0000 (13:32 +0000)]
am
6ba35b50: JDWP: asynchronous invoke command handling
* commit '
6ba35b50347aa7418c66c7b046cd164987e95df3':
JDWP: asynchronous invoke command handling
Nicolas Geoffray [Fri, 12 Jun 2015 12:35:55 +0000 (12:35 +0000)]
am
9832cc2f: am
10176757: Merge "Preserve class loading semantics in optimizing."
* commit '
9832cc2fb77ab1c2a4709861c9572c0565f84461':
Preserve class loading semantics in optimizing.
Calin Juravle [Fri, 12 Jun 2015 12:35:54 +0000 (12:35 +0000)]
am
f26f89a3: am
ee1264bd: Merge "Revert "Bring ReferenceTypePropagation to HInvoke return types""
* commit '
f26f89a31c67c3eabff70901ca3e8dd9fd3bcb5a':
Revert "Bring ReferenceTypePropagation to HInvoke return types"
Calin Juravle [Fri, 12 Jun 2015 12:35:53 +0000 (12:35 +0000)]
am
78ff6462: am
f0bb3a6b: Merge "Revert "Fix a checker test""
* commit '
78ff646243bb8fa49a08fbe875970ecbd66f53ab':
Revert "Fix a checker test"
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 12:07:05 +0000 (12:07 +0000)]
am
5bfbcfa3: am
b684aa93: Merge "Explicitly give the path of the library to build."
* commit '
5bfbcfa3e70083aeb656772994fc2d9b1e078ba2':
Explicitly give the path of the library to build.
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:25:32 +0000 (11:25 +0000)]
am
00f89270: am
5dcdf94a: Merge "Optimizing: Remove PcInfo, use the StackMapStream instead."
* commit '
00f892702807bc02e54748badc6738200dcf84d1':
Optimizing: Remove PcInfo, use the StackMapStream instead.
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 11:00:24 +0000 (11:00 +0000)]
am
a2e3a90a: am
42361f2e: Merge "JDWP: asynchronous invoke command handling"
* commit '
a2e3a90afd8010670fddc94fe4b9d79bfe4f8516':
JDWP: asynchronous invoke command handling
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 [Mon, 1 Jun 2015 15:33:12 +0000 (17:33 +0200)]
JDWP: asynchronous invoke command handling
The JDWP thread used to wait for the result of a method invocation
running in an event thread. But doing that prevents the JDWP thread
from processing incoming commands from the debugger if the event
thread gets suspended by a debug event occurring in another thread.
In Android Studio (or another IDE), this leads to the debugger being
blocked (with the famous message "Waiting until last debugger command
completes" of Android Studio / IntelliJ) because it is actually
waiting for the reply of its latest command while the JDWP thread
cannot process it.
This CL changes the way invoke commands (ClassType.InvokeCommand,
ClassType.NewInstance and ObjectReference.InvokeCommand) are handled
in the ART runtime.
The JDWP thread no longer waits for the event thread to complete the
method invocation. It now simply waits for the next JDWP command to
process. This means it does not send any reply for invoke commands,
except if the information given by the debugger is wrong. In this
case, it still sends a reply with the appropriate error code.
The event thread is now responsible for sending the reply (containing
the result and the exception object of the invoked method) before
going back to the suspended state.
In other words, we add special handling for invoke commands so they
are handled asynchronously while other commands remained handled
synchronously. In the future, we may want to handle all commands
asynchronously (using a queue of reply/event for instance) to remove
the special handling code this CL is adding.
Now the JDWP thread can process commands while a thread is invoking
a method, it is possible for the debugger to detach (by sending a
VirtualMachine.Dispose command) before the invocation completes. In
that situation, we must not suspend threads again (including the
event thread that executed the method) because they would all remain
suspended forever.
Also minor cleanup of the use of JDWP constants and update comments.
Bug:
21515842
Bug:
18899981
(cherry picked from commit
cbc5064ff05179b97b416f00ca579c55e38cd7d9)
Change-Id: I8d31006043468913ee8453212e6d16e11fcfe4ea
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:18:54 +0000 (10:18 +0000)]
am
da2495c9: am
995f6e23: Merge "Fix a checker test"
* commit '
da2495c92de982988b296f9cc4fbeb30e1d0bfd6':
Fix a checker test
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 10:01:17 +0000 (10:01 +0000)]
am
d24ce8af: am
6ab9edbc: Merge "Bring ReferenceTypePropagation to HInvoke return types"
* commit '
d24ce8af60b0a3e82a48307749ef4bc3542ebbd0':
Bring ReferenceTypePropagation to HInvoke return types
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
Nicolas Geoffray [Fri, 12 Jun 2015 09:48:27 +0000 (09:48 +0000)]
am
52a10894: am
3d4e3b93: Merge "Add libjavacoretests.so to the things to build."
* commit '
52a10894399d8df8c91acb80f8d96e0f580ce752':
Add libjavacoretests.so to the things to build.
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:37:06 +0000 (09:37 +0000)]
am
4b936956: am
edc0e4f3: Merge "Add dalvik.system to run-libcore-tests.sh"
* commit '
4b936956eeca2c01b732a503f2de5df22b83ad10':
Add dalvik.system to run-libcore-tests.sh
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:07:53 +0000 (08:07 +0000)]
am
1c18f34c: am
c19c9e8b: Merge "Don\'t run 098-ddmc, it\'s flaky."
* commit '
1c18f34c1e4b539d03d41ea67ad793f638450e93':
Don't run 098-ddmc, it's flaky.
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:34:44 +0000 (01:34 +0000)]
am
e36221ce: am
bb6a5557: Merge "Skip 098-ddmc for GC stress test"
* commit '
e36221ce244f838505facf18458caf32fbc7389c':
Skip 098-ddmc for GC stress test
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
Dmitriy Ivanov [Fri, 12 Jun 2015 00:47:44 +0000 (00:47 +0000)]
Merge "Revert "Let classloader provide correct LD_LIBRARY_PATH"" into mnc-dev-plus-aosp
Chris Thornton [Fri, 12 Jun 2015 00:39:29 +0000 (00:39 +0000)]
Merge branch 'mnc-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/art into mnc-dev-plus-aosp
Tim Murray [Fri, 12 Jun 2015 00:39:21 +0000 (00:39 +0000)]
am
c72c5ac9: Merge "Add cortex-a53 as a valid instruction set variant for arm64." into mnc-dev
* commit '
c72c5ac9d9e16ebf262f0dd75e9686a3e1d67bd9':
Add cortex-a53 as a valid instruction set variant for arm64.
Mathieu Chartier [Fri, 12 Jun 2015 00:39:20 +0000 (00:39 +0000)]
am
b89a8c66: Fix compaction bug in Class_getDeclaredMethodsUnchecked
* commit '
b89a8c66e360575d2dc1ec1229235735c56968ff':
Fix compaction bug in Class_getDeclaredMethodsUnchecked
Mathieu Chartier [Fri, 12 Jun 2015 00:39:19 +0000 (00:39 +0000)]
am
7f20e178: am
f1b5a27e: Merge "Fix compaction bug in Class_getDeclaredMethodsUnchecked"
* commit '
7f20e178260d4bf7b8df75ea6781619eb42cdc19':
Fix compaction bug in Class_getDeclaredMethodsUnchecked
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
Tim Murray [Fri, 12 Jun 2015 00:21:24 +0000 (00:21 +0000)]
Merge "Add cortex-a53 as a valid instruction set variant for arm64." into mnc-dev
Tim Murray [Fri, 12 Jun 2015 00:09:18 +0000 (17:09 -0700)]
Add cortex-a53 as a valid instruction set variant for arm64.
Change-Id: I720e2cc4acd94e367dae4a21c13aa90a3e30b7cc
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 23:21:42 +0000 (16:21 -0700)]
Fix compaction bug in Class_getDeclaredMethodsUnchecked
Added handle to fix the bug.
Bug:
21638351
Change-Id: I1c3abea33aa825d3a28c1fc5cb415508686ad93e
Dmitriy Ivanov [Thu, 11 Jun 2015 22:42:34 +0000 (15:42 -0700)]
Revert "Let classloader provide correct LD_LIBRARY_PATH"
This reverts commit
8117250a0bb57bf2aa6b1ab0c7d4d4a7dd402c08.
Mathieu Chartier [Thu, 11 Jun 2015 22:41:36 +0000 (22:41 +0000)]
am
1130cdfc: am
8d73a91d: Merge "Move image intern table into image"
* commit '
1130cdfc143bbc27f7bad3ec7a256257f15b95d9':
Move image intern table into image
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"
Dmitriy Ivanov [Thu, 11 Jun 2015 22:16:29 +0000 (22:16 +0000)]
am
125d7324: Merge "Let classloader provide correct LD_LIBRARY_PATH" into mnc-dev
* commit '
125d7324f1f75698ed20b2f64c36345d7f0bcabf':
Let classloader provide correct LD_LIBRARY_PATH
Mathieu Chartier [Thu, 11 Jun 2015 22:16:28 +0000 (22:16 +0000)]
am
fa5fc150: (-s ours) Merge "Move image intern table into image" into mnc-dev
* commit '
fa5fc150aa80c7472c6c2199a5ee21136dc43d5d':
Move image intern table into image
Hiroshi Yamauchi [Thu, 11 Jun 2015 22:09:05 +0000 (22:09 +0000)]
am
b2b9c191: am
cff58550: Merge "Reset GC performance stats at zygote fork."
* commit '
b2b9c1912c57b3b5f0545801074ba0a1989de073':
Reset GC performance stats at zygote fork.
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.
Dmitriy Ivanov [Thu, 11 Jun 2015 21:54:53 +0000 (21:54 +0000)]
Merge "Let classloader provide correct LD_LIBRARY_PATH" into mnc-dev
Hiroshi Yamauchi [Thu, 11 Jun 2015 21:46:50 +0000 (21:46 +0000)]
Merge "Reset GC performance stats at zygote fork."
Mathieu Chartier [Thu, 11 Jun 2015 21:45:53 +0000 (21:45 +0000)]
Merge "Move image intern table into image" into mnc-dev
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.
Bug:
20727525
Bug:
19569780
Change-Id: I08959e9aa2a73cedb52f393033e2ffea3a26e76b
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:43:27 +0000 (20:43 +0000)]
am
1c0451c6: am
15306dcd: Merge "Add hprof accounting for Class IMT, VTable"
* commit '
1c0451c62730de67590999da89b340f5cffb0e87':
Add hprof accounting for Class IMT, VTable
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 19:12:39 +0000 (19:12 +0000)]
am
81624f76: am
79b08e69: Merge "runtime: Minor cleanup and extra comments around interpreter"
* commit '
81624f76fb8c4b7ddde8dc35a85b5636e203c9e2':
runtime: Minor cleanup and extra comments around interpreter
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
Mathieu Chartier [Thu, 11 Jun 2015 17:25:46 +0000 (17:25 +0000)]
am
caad0e2b: am
9fb3e66a: Merge "Fix buildbot failure for 098-ddmc test"
* commit '
caad0e2b722e2c6b8733e016aa87eb9af51cc55d':
Fix buildbot failure for 098-ddmc test
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:20:48 +0000 (16:20 +0000)]
am
3aac9245: am
18af0bf1: Merge "Revert "art/tools: add new tests in security packages to the build bot""
* commit '
3aac9245fe4d22088e05c2a09adbb869d0edf24e':
Revert "art/tools: add new tests in security packages to the build bot"
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:58:28 +0000 (14:58 +0000)]
am
0e34ccc0: am
cb0c4c38: Merge "art/tools: add new tests in security packages to the build bot"
* commit '
0e34ccc0e9a08c1a0cfa09949a27bad868d3206a':
art/tools: add new tests in security packages to the build bot
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:48:34 +0000 (09:48 +0000)]
am
6a262882: am
8d868430: Merge "Fix build breakage in dwarf_test."
* commit '
6a2628829936b53a7b3eb23a4396036a0deac31c':
Fix build breakage in dwarf_test.
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
Andreas Gampe [Thu, 11 Jun 2015 02:31:56 +0000 (02:31 +0000)]
am
fdd0d353: am
e257ee43: Merge "ART: Fix BCE lint issue"
* commit '
fdd0d3539664a91d086b963a0ff68893c2adbc68':
ART: Fix BCE lint issue
David Srbecky [Thu, 11 Jun 2015 02:31:51 +0000 (02:31 +0000)]
am
f5ab4be1: am
bc8a8eea: Merge "Generate debug info for core.oat files."
* commit '
f5ab4be17fd8cbb6b7d46715938cc40928b129ee':
Generate debug info for core.oat files.
Andreas Gampe [Thu, 11 Jun 2015 02:31:47 +0000 (02:31 +0000)]
am
07782251: am
92540564: Merge "[MIPS] Fix method tracing for mips64"
* commit '
077822510e3b328e5b9a22940c586faee11182a6':
[MIPS] Fix method tracing for mips64