OSDN Git Service
Elliott Hughes [Mon, 6 Aug 2012 17:14:12 +0000 (10:14 -0700)]
am
74f9cd03: am
8fb8c4de: Merge "RETURN_VOID_BARRIER is also a return."
* commit '
74f9cd03d837538d311cc068bdd31cfd66eb014c':
RETURN_VOID_BARRIER is also a return.
Elliott Hughes [Mon, 6 Aug 2012 16:59:50 +0000 (09:59 -0700)]
am
8fb8c4de: Merge "RETURN_VOID_BARRIER is also a return."
* commit '
8fb8c4de25c5c95019a06b37f17bb6d82b41f4ac':
RETURN_VOID_BARRIER is also a return.
Elliott Hughes [Mon, 6 Aug 2012 16:34:31 +0000 (09:34 -0700)]
Merge "RETURN_VOID_BARRIER is also a return."
Elliott Hughes [Mon, 6 Aug 2012 16:16:08 +0000 (09:16 -0700)]
RETURN_VOID_BARRIER is also a return.
Bug: http://code.google.com/p/android/issues/detail?id=36003
Change-Id: I7fb53b0898158a3ad7b0eb4f8385674ddaeffd60
Brian Carlstrom [Fri, 3 Aug 2012 00:57:26 +0000 (17:57 -0700)]
am
93018cdc: am
0b79e282: Merge "Change dalvik script to use exec"
* commit '
93018cdcc6d419b19587ad2e6622284a4b72742c':
Change dalvik script to use exec
Brian Carlstrom [Fri, 3 Aug 2012 00:55:33 +0000 (17:55 -0700)]
am
0b79e282: Merge "Change dalvik script to use exec"
* commit '
0b79e2824eeb763ea82aa8ff544ef7b20ea7fdd5':
Change dalvik script to use exec
Brian Carlstrom [Fri, 3 Aug 2012 00:36:55 +0000 (17:36 -0700)]
Merge "Change dalvik script to use exec"
Brian Carlstrom [Fri, 3 Aug 2012 00:05:25 +0000 (17:05 -0700)]
Change dalvik script to use exec
Change-Id: I0a82ced8ce31ae0e6916509a1c79b738c475ae18
Elliott Hughes [Wed, 1 Aug 2012 21:51:40 +0000 (14:51 -0700)]
am
339c627e: am
8ad6a746: Merge "Fix an array out-of-bound read in the JIT compiler."
* commit '
339c627e690215687deca0b845932c220ee9ebb3':
Fix an array out-of-bound read in the JIT compiler.
Elliott Hughes [Wed, 1 Aug 2012 21:47:42 +0000 (14:47 -0700)]
am
8ad6a746: Merge "Fix an array out-of-bound read in the JIT compiler."
* commit '
8ad6a74627b70166e594e15514f289a25eb8f721':
Fix an array out-of-bound read in the JIT compiler.
Elliott Hughes [Wed, 1 Aug 2012 21:33:30 +0000 (14:33 -0700)]
Merge "Fix an array out-of-bound read in the JIT compiler."
Douglas Leung [Wed, 1 Aug 2012 19:00:33 +0000 (12:00 -0700)]
Fix an array out-of-bound read in the JIT compiler.
Without the fix the compiler is still safe since the offending memory access
is a read, though the hoisted distance is non-deterministic. The easiest and
safest fix is to unconditionally hoist a load when it can reach the
scheduling barrier.
Change-Id: I021161cb2a6e011301ab65ba62bc2a74af1cb552
Signed-off-by: Douglas Leung <douglas@mips.com>
Elliott Hughes [Tue, 31 Jul 2012 21:45:14 +0000 (14:45 -0700)]
am
5918aeff: am
5b861ab5: Merge "Fix the MIPS build: 1. LOG->ALOG conversion 2. Remove Jumbo opcodes support"
* commit '
5918aeff98a37d3314ea485329a5d6f95b6941e1':
Fix the MIPS build: 1. LOG->ALOG conversion 2. Remove Jumbo opcodes support
Elliott Hughes [Tue, 31 Jul 2012 21:40:49 +0000 (14:40 -0700)]
am
5b861ab5: Merge "Fix the MIPS build: 1. LOG->ALOG conversion 2. Remove Jumbo opcodes support"
* commit '
5b861ab5541e9806d6255f17769acad3c2b4029b':
Fix the MIPS build: 1. LOG->ALOG conversion 2. Remove Jumbo opcodes support
Elliott Hughes [Tue, 31 Jul 2012 21:31:32 +0000 (14:31 -0700)]
Merge "Fix the MIPS build: 1. LOG->ALOG conversion 2. Remove Jumbo opcodes support"
Raghu Gandham [Mon, 30 Jul 2012 21:46:12 +0000 (14:46 -0700)]
Fix the MIPS build:
1. LOG->ALOG conversion
2. Remove Jumbo opcodes support
Change-Id: Ifbd1eae2f5e7a1cab5828ebfbdba380ad499abfd
The Android Open Source Project [Fri, 27 Jul 2012 22:46:07 +0000 (15:46 -0700)]
The Android Open Source Project [Fri, 27 Jul 2012 21:50:10 +0000 (14:50 -0700)]
Reconcile with jb-release
Change-Id: Id73f7a55edc5654069e7ce75f5545d3bff4448da
The Android Automerger [Wed, 25 Jul 2012 03:23:09 +0000 (20:23 -0700)]
merge in jb-release history after reset to jb-dev
Elliott Hughes [Tue, 24 Jul 2012 02:53:19 +0000 (19:53 -0700)]
am
505c1cad: am
37755063: Merge "Fix Method.getParameterAnnotations."
* commit '
505c1cad45fe793d59842bfbf6bae1d9e195b427':
Fix Method.getParameterAnnotations.
Elliott Hughes [Tue, 24 Jul 2012 00:44:30 +0000 (17:44 -0700)]
am
37755063: Merge "Fix Method.getParameterAnnotations."
* commit '
37755063648910ee919c22c3d15cd57092026633':
Fix Method.getParameterAnnotations.
Elliott Hughes [Tue, 24 Jul 2012 00:30:21 +0000 (17:30 -0700)]
Merge "Fix Method.getParameterAnnotations."
Elliott Hughes [Mon, 23 Jul 2012 17:49:56 +0000 (10:49 -0700)]
Fix Method.getParameterAnnotations.
The dex format represents parameter annotations using an
annotation_set_ref_item for each parameter. According to the spec,
the item's annotation_offset can be "0 if there are no annotations for this
element". The Dalvik VM accepts 0 values in the verification step,
but Method#getParameterAnnotations then crashes with a segmentation fault.
Bug: http://code.google.com/p/android/issues/detail?id=35304
Change-Id: I0ac7336d369894520c8e17848ab6a91dbbd905e9
Elliott Hughes [Sat, 21 Jul 2012 05:34:59 +0000 (22:34 -0700)]
am
025a6d08: am
b498bf42: Merge "[X86] X86 trace JIT compiler support"
* commit '
025a6d088554fcdaa8c0e94231c4048749bf103a':
[X86] X86 trace JIT compiler support
Elliott Hughes [Fri, 20 Jul 2012 19:47:25 +0000 (12:47 -0700)]
am
b498bf42: Merge "[X86] X86 trace JIT compiler support"
* commit '
b498bf420d28aeab14384fcc12db54d00ede03d3':
[X86] X86 trace JIT compiler support
Elliott Hughes [Fri, 20 Jul 2012 19:34:16 +0000 (12:34 -0700)]
Merge "[X86] X86 trace JIT compiler support"
Dong-Yuan Chen [Tue, 3 Jul 2012 20:13:07 +0000 (13:13 -0700)]
[X86] X86 trace JIT compiler support
This patch provides a fully functional x86 trace JIT compiler for Dalvik
VM. It is built on top of the existing x86 fast interpreter
with bug fixes and needed extension to support trace JIT interface. The
x86 trace JIT code generator was developed independent of the existing
template-based code generator and thus does not share exactly the same
infrastructure. Included in this patch are:
* Deprecated and removed the x86-atom fast interpreter that is no
longer functional since ICS.
* Augmented x86 fast interpreter to provide interfaces for x86 trace JIT
compiler.
* Added x86 trace JIT code generator with full JDWP debugging support.
* Method JIT and self-verification mode are not supported.
The x86 code generator uses the x86 instruction encoder/decoder library
from the Apache Harmony project. Additional wrapper extension and bug
fixes were added to support the x86 trace JIT code generator. The x86
instruction encoder/decoder is embedded inside the x86 code generator
under the libenc subdirectory.
Change-Id: I241113681963a16c13a3562390813cbaaa6eedf0
Signed-off-by: Dong-Yuan Chen <dong-yuan.chen@intel.com>
Signed-off-by: Yixin Shou <yixin.shou@intel.com>
Signed-off-by: Johnnie Birch <johnnie.l.birch.jr@intel.com>
Signed-off-by: Udayan <udayan.banerji@intel.com>
Signed-off-by: Sushma Kyasaralli Thimmappa <sushma.kyasaralli.thimmappa@intel.com>
Signed-off-by: Bijoy Jose <bijoy.a.jose@intel.com>
Signed-off-by: Razvan A Lupusoru <razvan.a.lupusoru@intel.com>
Signed-off-by: Tim Hartley <timothy.d.hartley@intel.com>
The Android Open Source Project [Thu, 19 Jul 2012 15:52:09 +0000 (08:52 -0700)]
The Android Open Source Project [Thu, 19 Jul 2012 15:36:06 +0000 (08:36 -0700)]
Reconcile with jb-mr0-release
Change-Id: I3f1190900571a53d58ef0b7816490b9e9019b2f3
The Android Automerger [Thu, 19 Jul 2012 06:04:36 +0000 (23:04 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 19 Jul 2012 04:44:39 +0000 (21:44 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Elliott Hughes [Thu, 19 Jul 2012 03:21:20 +0000 (20:21 -0700)]
am
c870b1b8: am
51801371: Avoid sign extension in packed-switch.
* commit '
c870b1b88cda7d5f5afd7015a15e1f60e80355fc':
Avoid sign extension in packed-switch.
Elliott Hughes [Thu, 19 Jul 2012 03:15:18 +0000 (20:15 -0700)]
am
abede656: Merge "Use uintptr_t for cast pointer to integer."
* commit '
abede656a1f2330e3d31281fb208be7c04e8eb56':
Use uintptr_t for cast pointer to integer.
Elliott Hughes [Thu, 19 Jul 2012 03:15:16 +0000 (20:15 -0700)]
am
fd9491c5: Merge "Remove untested SH "support"; bionic long since stopped supporting SH."
* commit '
fd9491c5ea82e91d0085679caa82195bb5b4d17b':
Remove untested SH "support"; bionic long since stopped supporting SH.
Elliott Hughes [Thu, 19 Jul 2012 03:13:57 +0000 (20:13 -0700)]
am
51801371: Avoid sign extension in packed-switch.
* commit '
51801371a9b0f829303d326a2300518177dde3e8':
Avoid sign extension in packed-switch.
Elliott Hughes [Thu, 19 Jul 2012 00:14:50 +0000 (17:14 -0700)]
Merge "Use uintptr_t for cast pointer to integer."
SangWook Han [Sun, 15 Jul 2012 13:42:28 +0000 (22:42 +0900)]
Use uintptr_t for cast pointer to integer.
On 64bit host, sizeof pointer is not equal to sizeof int/u4.
Need for host tools.
Change-Id: Id8d9418787e79523226b9c9e3f67277f9ac7c6aa
Elliott Hughes [Wed, 18 Jul 2012 20:41:54 +0000 (13:41 -0700)]
Merge "Remove untested SH "support"; bionic long since stopped supporting SH."
Elliott Hughes [Wed, 18 Jul 2012 16:55:15 +0000 (09:55 -0700)]
Remove untested SH "support"; bionic long since stopped supporting SH.
Hello world!
Change-Id: I4660c8905b2641f90d90987938498e8693dc33da
Elliott Hughes [Wed, 18 Jul 2012 06:17:51 +0000 (23:17 -0700)]
am
53c6022c: Merge "Avoid sign extension in packed-switch."
* commit '
53c6022cd1211bfa7d14c95585f3554c8cea8aa2':
Avoid sign extension in packed-switch.
Elliott Hughes [Wed, 18 Jul 2012 01:11:59 +0000 (18:11 -0700)]
Merge "Avoid sign extension in packed-switch."
Elliott Hughes [Tue, 17 Jul 2012 23:31:30 +0000 (16:31 -0700)]
Avoid sign extension in packed-switch.
This code (at least in the ARM version) is trying to assign to r0 and r1
from C by returning a 64-bit result. The mistaken use of signed integers
for pointers can lead to sign extension if the JIT code cache is at a
sufficiently high address.
Bug:
6799823
Bug:
6703991
(cherry-pick from
2d0c1c2dbe44458ebb199c47ce1047f266db5349.)
Change-Id: I79e72228b60e195272d11899ac69bb4a76b7402f
Elliott Hughes [Tue, 17 Jul 2012 23:31:30 +0000 (16:31 -0700)]
Avoid sign extension in packed-switch.
This code (at least in the ARM version) is trying to assign to r0 and r1
from C by returning a 64-bit result. The mistaken use of signed integers
for pointers can lead to sign extension if the JIT code cache is at a
sufficiently high address.
Bug:
6799823
Bug:
6703991
(cherry picked from commit
2d0c1c2dbe44458ebb199c47ce1047f266db5349)
Conflicts:
vm/compiler/codegen/mips/CalloutHelper.h
vm/compiler/codegen/mips/CodegenDriver.cpp
Change-Id: Id4699fdd0b3d61abe9c92874832b8561df4fa797
Elliott Hughes [Wed, 18 Jul 2012 00:01:28 +0000 (17:01 -0700)]
Merge "Avoid sign extension in packed-switch."
Elliott Hughes [Tue, 17 Jul 2012 23:38:20 +0000 (16:38 -0700)]
am
319206f3: Merge "Fix a small and unlikely memory leak."
* commit '
319206f324bd937bc1d661dec2082413e41cf8e5':
Fix a small and unlikely memory leak.
Elliott Hughes [Tue, 17 Jul 2012 23:31:30 +0000 (16:31 -0700)]
Avoid sign extension in packed-switch.
This code (at least in the ARM version) is trying to assign to r0 and r1
from C by returning a 64-bit result. The mistaken use of signed integers
for pointers can lead to sign extension if the JIT code cache is at a
sufficiently high address.
Bug:
6799823
Bug:
6703991
Change-Id: Ic3f587f453f0f3f520551383ef1ed29efa1ad551
Elliott Hughes [Tue, 17 Jul 2012 23:25:20 +0000 (16:25 -0700)]
Merge "Fix a small and unlikely memory leak."
Elliott Hughes [Tue, 17 Jul 2012 23:19:09 +0000 (16:19 -0700)]
Fix a small and unlikely memory leak.
Change-Id: I131b9f2f8ae4a4b2bb3bb00bc2cd1e607d979bb5
Elliott Hughes [Tue, 17 Jul 2012 22:32:35 +0000 (15:32 -0700)]
am
80f212b7: Merge "Remove some dead code in the MIPS stuff, and run rebuild.sh."
* commit '
80f212b7365ab116541f151db559e6653fe5a55b':
Remove some dead code in the MIPS stuff, and run rebuild.sh.
Elliott Hughes [Tue, 17 Jul 2012 22:14:37 +0000 (15:14 -0700)]
Merge "Remove some dead code in the MIPS stuff, and run rebuild.sh."
Elliott Hughes [Tue, 17 Jul 2012 22:11:25 +0000 (15:11 -0700)]
Remove some dead code in the MIPS stuff, and run rebuild.sh.
Change-Id: I7c3226efe97e6e5678b757eb2350d0eeb2efd8b5
Elliott Hughes [Mon, 16 Jul 2012 20:33:24 +0000 (13:33 -0700)]
am
ad8bebe4: Merge "Don\'t log "WAIT_FOR_CONCURRENT_GC blocked 0ms"."
* commit '
ad8bebe4a097a3fdcb4d858dbedf49a1904acfee':
Don't log "WAIT_FOR_CONCURRENT_GC blocked 0ms".
Elliott Hughes [Mon, 16 Jul 2012 20:26:43 +0000 (13:26 -0700)]
Merge "Don't log "WAIT_FOR_CONCURRENT_GC blocked 0ms"."
Elliott Hughes [Mon, 16 Jul 2012 18:44:52 +0000 (11:44 -0700)]
Don't log "WAIT_FOR_CONCURRENT_GC blocked 0ms".
Stupid to spend more time logging than we spent waiting. (Highly visible
in the zygote's preloading phase.)
Change-Id: If2d6b6093b3bebae0887aa385745b7ed9225216b
Elliott Hughes [Fri, 13 Jul 2012 19:20:39 +0000 (12:20 -0700)]
am
4d7567a6: Merge "Warn if we see a class whose behavior has changed because of https://android-review.googlesource.com/#/c/32480/."
* commit '
4d7567a600ae06df053f0e48918c984927eb6671':
Warn if we see a class whose behavior has changed because of https://android-review.googlesource.com/#/c/32480/.
Elliott Hughes [Fri, 13 Jul 2012 19:09:42 +0000 (12:09 -0700)]
Merge "Warn if we see a class whose behavior has changed because of https://android-review.googlesource.com/#/c/32480/."
Elliott Hughes [Fri, 13 Jul 2012 18:41:50 +0000 (11:41 -0700)]
Warn if we see a class whose behavior has changed because of https://android-review.googlesource.com/#/c/32480/.
Change-Id: Ic7ca229a92c8d1bd666ecf64209d061301dcb0c9
Elliott Hughes [Thu, 12 Jul 2012 20:12:50 +0000 (13:12 -0700)]
am
fe269684: Merge "s/LOGE/ALOGE/ in HAVE_SELINUX blocks"
* commit '
fe26968480166e0788856b382841274b77655449':
s/LOGE/ALOGE/ in HAVE_SELINUX blocks
Elliott Hughes [Thu, 12 Jul 2012 17:16:39 +0000 (10:16 -0700)]
Merge "s/LOGE/ALOGE/ in HAVE_SELINUX blocks"
Joshua Brindle [Tue, 10 Jul 2012 14:22:09 +0000 (10:22 -0400)]
s/LOGE/ALOGE/ in HAVE_SELINUX blocks
The latest push changed LOGE to ALOGE but it was not updated in HAVE_SELINUX blocks.
Change-Id: If64c6beeb1d7c24e1b610acb8ccb195e00c777da
Signed-off-by: Joshua Brindle <jbrindle@tresys.com>
Elliott Hughes [Wed, 11 Jul 2012 17:57:36 +0000 (10:57 -0700)]
am
84cdf110: Merge "Avoid method overriding if its super method is inaccessible."
* commit '
84cdf1103122aaef5d3969a7b02f3d1965a894c6':
Avoid method overriding if its super method is inaccessible.
Elliott Hughes [Wed, 11 Jul 2012 17:57:34 +0000 (10:57 -0700)]
am
202bc301: Merge "Missing zero-checks in JIT compiler"
* commit '
202bc301c313b4b49b04bdc59e484b439222462d':
Missing zero-checks in JIT compiler
Elliott Hughes [Wed, 11 Jul 2012 00:20:00 +0000 (17:20 -0700)]
Merge "Avoid method overriding if its super method is inaccessible."
Im Sooin [Thu, 9 Feb 2012 06:39:05 +0000 (15:39 +0900)]
Avoid method overriding if its super method is inaccessible.
A call to package private method could be redirected to subclass which
was not in the same package.
Modified vtable to retain virtual super methods which cannot be accessed.
This change affects vtable index in optimized dex.
Change-Id: I9cc7e309c305bca12e5061009c4245fb70014681
Signed-off-by: Im Sooin <ciecet@gmail.com>
Elliott Hughes [Tue, 10 Jul 2012 23:54:46 +0000 (16:54 -0700)]
Merge "Missing zero-checks in JIT compiler"
Mattias Petersson [Thu, 7 Jun 2012 14:39:21 +0000 (16:39 +0200)]
Missing zero-checks in JIT compiler
Zero-checks were not generated by the JIT compiler for
some instructions. This caused crashes instead of
the expected ArithmeticException.
Change-Id: Ic8041741a7cccc1bd6b8c3c0723ba55a55af856b
Jean-Baptiste Queru [Mon, 9 Jul 2012 20:36:36 +0000 (13:36 -0700)]
am
5220f12d: Merge from AOSP
* commit '
5220f12dca8ad2666a97e36862bf0d4767e3555e':
hprof generation, not writing the first record
Jean-Baptiste Queru [Mon, 9 Jul 2012 20:31:08 +0000 (13:31 -0700)]
Merge from AOSP
Change-Id: I8ac8ecf5d57b4d852957a0c4498e3e304e8e2e17
Elliott Hughes [Mon, 9 Jul 2012 18:53:01 +0000 (11:53 -0700)]
Merge "hprof generation, not writing the first record"
Elliott Hughes [Tue, 3 Jul 2012 16:28:55 +0000 (09:28 -0700)]
am
f31a6f7b: am
7798a614: Merge "Fix a possible off-by-one in the verifier."
* commit '
f31a6f7b1648c079e45a519ed3dd84f7c1b5f768':
Fix a possible off-by-one in the verifier.
Elliott Hughes [Tue, 3 Jul 2012 16:25:29 +0000 (09:25 -0700)]
am
7798a614: Merge "Fix a possible off-by-one in the verifier."
* commit '
7798a614753251adf7a77835792d78db2e93f5ff':
Fix a possible off-by-one in the verifier.
Johan Erlandsson [Mon, 11 Jun 2012 16:18:59 +0000 (18:18 +0200)]
hprof generation, not writing the first record
We miss some roots since the first record isn't initialized.
Change-Id: I50c80a701a4ee142c52602b9015f6e93be54da9f
Elliott Hughes [Mon, 2 Jul 2012 05:11:48 +0000 (22:11 -0700)]
Merge "Fix a possible off-by-one in the verifier."
Elliott Hughes [Fri, 29 Jun 2012 23:45:06 +0000 (16:45 -0700)]
Fix a possible off-by-one in the verifier.
Bug: http://code.google.com/p/android/issues/detail?id=10863
Change-Id: I604f9a5ea08b6a6934b3ba522e1fda0bb738f81c
Elliott Hughes [Thu, 21 Jun 2012 23:47:21 +0000 (16:47 -0700)]
am
8ca227ef: resolved conflicts for merge of
7c03fb79 to jb-dev-plus-aosp
* commit '
8ca227ef75cdb1511ea3b11679526a6de5a99974':
Extend forkAndSpecialize to take additional inputs and to set the SELinux security context.
Elliott Hughes [Thu, 21 Jun 2012 21:15:11 +0000 (14:15 -0700)]
resolved conflicts for merge of
7c03fb79 to jb-dev-plus-aosp
Change-Id: Icedbe5a6d7cbcedde53e05249f7e90a390f2f0ea
Kenny Root [Thu, 21 Jun 2012 18:05:52 +0000 (11:05 -0700)]
Merge "Extend forkAndSpecialize to take additional inputs and to set the SELinux security context."
Jean-Baptiste Queru [Wed, 20 Jun 2012 20:46:47 +0000 (13:46 -0700)]
am
de574936: am
44292346: Merge "Switched code to blx <reg>"
* commit '
de574936841bbfa9ad82b5876e214bc918ee777c':
Switched code to blx <reg>
Jean-Baptiste Queru [Wed, 20 Jun 2012 20:43:24 +0000 (13:43 -0700)]
am
44292346: Merge "Switched code to blx <reg>"
* commit '
44292346f4935cd078ca7b931042809af80f9d95':
Switched code to blx <reg>
Jean-Baptiste Queru [Wed, 20 Jun 2012 16:41:12 +0000 (09:41 -0700)]
Merge "Switched code to blx <reg>"
David Butcher [Wed, 20 Jun 2012 13:31:33 +0000 (14:31 +0100)]
Switched code to blx <reg>
ldr ip,<addr> blx ip is preferred over mov lr,pc ldr pc,<addr> from armv5te,
and will typically perform better on later ARM processors.
Change-Id: I8f2e5e794c644faafd767037ad56579f2934de47
Elliott Hughes [Tue, 12 Jun 2012 00:45:49 +0000 (17:45 -0700)]
am
f2a33d44: am
effc95cb: Merge "Make dex merging stateless."
* commit '
f2a33d444213c328642daae78742e9e978c94c28':
Make dex merging stateless.
Elliott Hughes [Tue, 12 Jun 2012 00:45:48 +0000 (17:45 -0700)]
am
5164762f: am
a9ac3a9d: Merge "Support debug info in dexmerge."
* commit '
5164762f98362866f50cda3c7f2b72b519be9c91':
Support debug info in dexmerge.
Elliott Hughes [Tue, 12 Jun 2012 00:43:14 +0000 (17:43 -0700)]
am
effc95cb: Merge "Make dex merging stateless."
* commit '
effc95cb732d8d5453930e647240a1665b6dc71a':
Make dex merging stateless.
Elliott Hughes [Tue, 12 Jun 2012 00:43:13 +0000 (17:43 -0700)]
am
a9ac3a9d: Merge "Support debug info in dexmerge."
* commit '
a9ac3a9d1f8de71bcdc39d1f4827c04a952a0c29':
Support debug info in dexmerge.
Elliott Hughes [Mon, 11 Jun 2012 23:41:26 +0000 (16:41 -0700)]
Merge "Make dex merging stateless."
Xavier Ducrohet [Mon, 11 Jun 2012 22:17:31 +0000 (15:17 -0700)]
Make dex merging stateless.
This is required to run dx in Eclipse which doesn't unload the dx
library after each run.
(cherry-pick of
7aa5ce7e990dc3766eba97cd0932b62e4de21503.)
Change-Id: I7a69a3015d448ddd5558c307cd01346156cbc739
Elliott Hughes [Mon, 11 Jun 2012 23:30:30 +0000 (16:30 -0700)]
Merge "Support debug info in dexmerge."
Elliott Hughes [Thu, 7 Jun 2012 23:47:38 +0000 (16:47 -0700)]
Support debug info in dexmerge.
Bug:
4090053
(cherry-pick of
bc23c4f3ebaefebb3f1be7732767631f91e165ea.)
Change-Id: I1108933fc03330ff91be3a2edef8b4966977dcd7
Signed-off-by: Jesse Wilson <jesse@swank.ca>
Xavier Ducrohet [Mon, 11 Jun 2012 22:17:31 +0000 (15:17 -0700)]
Make dex merging stateless.
This is required to run dx in Eclipse which doesn't unload the dx
library after each run.
Change-Id: I84df49d424ea465f70613eb602d1a4890804296a
Elliott Hughes [Mon, 11 Jun 2012 18:26:58 +0000 (11:26 -0700)]
am
c3cd2420: am
bf11122d: Merge "Revert " Trim after explicit gc.""
* commit '
c3cd242005fb31035265d0bbd5681518eea656b4':
Revert " Trim after explicit gc."
Elliott Hughes [Mon, 11 Jun 2012 18:22:17 +0000 (11:22 -0700)]
am
bf11122d: Merge "Revert " Trim after explicit gc.""
* commit '
bf11122d175d1315783b313897ee8ecae63f0278':
Revert " Trim after explicit gc."
Elliott Hughes [Mon, 11 Jun 2012 16:03:36 +0000 (09:03 -0700)]
Merge "Revert " Trim after explicit gc.""
Elliott Hughes [Mon, 11 Jun 2012 15:41:06 +0000 (08:41 -0700)]
Revert " Trim after explicit gc."
This reverts commit
ea4c6e57a48e08eacbf08520c64133175e7d5da0
Elliott Hughes [Thu, 7 Jun 2012 23:47:38 +0000 (16:47 -0700)]
Support debug info in dexmerge.
Bug:
4090053
Change-Id: Ided1979b306539bfe3576ef17b72689fc9705abb
Signed-off-by: Jesse Wilson <jesse@swank.ca>
The Android Open Source Project [Thu, 7 Jun 2012 14:52:09 +0000 (07:52 -0700)]
The Android Open Source Project [Thu, 7 Jun 2012 14:48:51 +0000 (07:48 -0700)]
Reconcile with jb-release
Change-Id: I3e7e63e5d19d73ece11951f9cc3f85589c72adbe
Elliott Hughes [Tue, 5 Jun 2012 22:18:06 +0000 (15:18 -0700)]
am
7d740cf6: am
53bc3719: Merge "Fixing a crash when doing lock profiling"
* commit '
7d740cf6430a86edca1fcf20fd974b53b00136f8':
Fixing a crash when doing lock profiling
Elliott Hughes [Tue, 5 Jun 2012 22:16:27 +0000 (15:16 -0700)]
am
53bc3719: Merge "Fixing a crash when doing lock profiling"
* commit '
53bc3719bab6f0a075dd3f968a6d9a630fb81476':
Fixing a crash when doing lock profiling
Elliott Hughes [Tue, 5 Jun 2012 21:33:14 +0000 (14:33 -0700)]
Merge "Fixing a crash when doing lock profiling"