OSDN Git Service
Elliott Hughes [Thu, 20 Dec 2012 19:06:49 +0000 (11:06 -0800)]
am
5aca5172: am
5155b31c: Merge "Change NewDirectByteBuffer to allow NULL if capacity == 0."
* commit '
5aca5172a19aa440446c6b310e1fc599f9421866':
Change NewDirectByteBuffer to allow NULL if capacity == 0.
Elliott Hughes [Thu, 20 Dec 2012 19:03:36 +0000 (11:03 -0800)]
am
5155b31c: Merge "Change NewDirectByteBuffer to allow NULL if capacity == 0."
* commit '
5155b31cd96474459cff380621ebb9a77b2b7cbc':
Change NewDirectByteBuffer to allow NULL if capacity == 0.
Elliott Hughes [Thu, 20 Dec 2012 02:05:01 +0000 (18:05 -0800)]
Merge "Change NewDirectByteBuffer to allow NULL if capacity == 0."
Elliott Hughes [Wed, 19 Dec 2012 23:45:18 +0000 (15:45 -0800)]
Change NewDirectByteBuffer to allow NULL if capacity == 0.
Also make the diagnostics more uniform.
Bug:
7892060
Change-Id: Ib3ca0d6241a5958d2c8681337b1883fc3d74cb54
Ying Wang [Wed, 19 Dec 2012 22:50:34 +0000 (14:50 -0800)]
am
92f5ec96: resolved conflicts for merge of
e016e80c to jb-mr1-dev-plus-aosp
* commit '
92f5ec962e69bc0788b53c16a469ca48e64223e7':
Ying Wang [Wed, 19 Dec 2012 21:28:01 +0000 (13:28 -0800)]
resolved conflicts for merge of
e016e80c to jb-mr1-dev-plus-aosp
Change-Id: I889b3aac68aec152d34d14431b854d7a8e6575a9
Elliott Hughes [Wed, 19 Dec 2012 20:34:43 +0000 (12:34 -0800)]
am
5df36312: am
a20a1fd6: Merge "Optimize dvmHash Loops."
* commit '
5df36312d3e51be2812092de850bf4927092ce89':
Optimize dvmHash Loops.
Elliott Hughes [Wed, 19 Dec 2012 20:33:22 +0000 (12:33 -0800)]
am
a20a1fd6: Merge "Optimize dvmHash Loops."
* commit '
a20a1fd6795dc053d2d7988f80ce19454d8ba043':
Optimize dvmHash Loops.
Elliott Hughes [Wed, 19 Dec 2012 18:51:40 +0000 (10:51 -0800)]
Merge "Optimize dvmHash Loops."
You Kim [Wed, 19 Dec 2012 05:25:21 +0000 (14:25 +0900)]
Optimize dvmHash Loops.
pHashTable->tableSize is working as volatile variable & is evaluated on every iteration.
Help compiler to define tableSize as local(Register) variable.
Change-Id: Iecdea3ecb810319d461ff3924ef21fd6c2d69d1e
Elliott Hughes [Mon, 17 Dec 2012 21:53:11 +0000 (13:53 -0800)]
am
fbe2baf6: am
72d8557f: Merge "Optimize opcodes to avoid bubble in pipeline."
* commit '
fbe2baf69db21f691d3d0fd2b2a96bad8dca424e':
Optimize opcodes to avoid bubble in pipeline.
Elliott Hughes [Mon, 17 Dec 2012 21:51:02 +0000 (13:51 -0800)]
am
72d8557f: Merge "Optimize opcodes to avoid bubble in pipeline."
* commit '
72d8557fbc8e82ded7d163a476ac5963a91c5128':
Optimize opcodes to avoid bubble in pipeline.
Elliott Hughes [Mon, 17 Dec 2012 21:45:41 +0000 (13:45 -0800)]
Merge "Optimize opcodes to avoid bubble in pipeline."
Elliott Hughes [Mon, 17 Dec 2012 19:21:29 +0000 (11:21 -0800)]
am
6014a37f: am
78798c71: Merge "Remove possilbe leaks in dalvik."
* commit '
6014a37f244671117800ea0cc9fcf18dfd77c615':
Remove possilbe leaks in dalvik.
Elliott Hughes [Mon, 17 Dec 2012 19:19:19 +0000 (11:19 -0800)]
am
78798c71: Merge "Remove possilbe leaks in dalvik."
* commit '
78798c711e50643f7f71b0c79dd9c3c7f4d095ac':
Remove possilbe leaks in dalvik.
Elliott Hughes [Mon, 17 Dec 2012 19:00:02 +0000 (11:00 -0800)]
am
4b93195e: am
538831ea: Merge "Reclaiming attribute obj after pthread_create"
* commit '
4b93195e487eae53f73aca47b8cce2acbcb5f33d':
Reclaiming attribute obj after pthread_create
Elliott Hughes [Mon, 17 Dec 2012 19:00:01 +0000 (11:00 -0800)]
am
61e745d1: am
d9e08aae: Merge "Remove dead code."
* commit '
61e745d10590a96c08d15d2e14d8bde5b0eddd7b':
Remove dead code.
Elliott Hughes [Mon, 17 Dec 2012 18:59:43 +0000 (10:59 -0800)]
Merge "Remove possilbe leaks in dalvik."
You Kim [Sun, 16 Dec 2012 18:14:01 +0000 (03:14 +0900)]
Remove possilbe leaks in dalvik.
Add missing free() calls.
Change-Id: Id602b84ba8f15fef1851f37e3d5aac214ac67de1
Elliott Hughes [Mon, 17 Dec 2012 18:58:31 +0000 (10:58 -0800)]
am
538831ea: Merge "Reclaiming attribute obj after pthread_create"
* commit '
538831ea621f2fbfe46bef9373f31869e822eb9b':
Reclaiming attribute obj after pthread_create
Elliott Hughes [Mon, 17 Dec 2012 18:58:30 +0000 (10:58 -0800)]
am
d9e08aae: Merge "Remove dead code."
* commit '
d9e08aae4dfee99961e7bcb8d9997c11c1d981ef':
Remove dead code.
Elliott Hughes [Mon, 17 Dec 2012 18:54:49 +0000 (10:54 -0800)]
Merge "Reclaiming attribute obj after pthread_create"
You Kim [Sun, 16 Dec 2012 17:36:44 +0000 (02:36 +0900)]
Reclaiming attribute obj after pthread_create
call pthread_attr_destroy in order to reclaim attribute object.
Change-Id: I2592903ef67101a7c656a3ab0ad243a9716298b5
Elliott Hughes [Mon, 17 Dec 2012 18:42:06 +0000 (10:42 -0800)]
Merge "Remove dead code."
Elliott Hughes [Mon, 17 Dec 2012 18:39:25 +0000 (10:39 -0800)]
am
40e874ee: am
0e84ab50: Merge "Fail if the new index is out of range."
* commit '
40e874ee76ef2126e48aab73f87b96138ce5c6e7':
Fail if the new index is out of range.
Elliott Hughes [Mon, 17 Dec 2012 18:37:50 +0000 (10:37 -0800)]
am
0e84ab50: Merge "Fail if the new index is out of range."
* commit '
0e84ab50c525e144b4dc52f38a3ac4a08e4ad6f6':
Fail if the new index is out of range.
Elliott Hughes [Mon, 17 Dec 2012 18:35:01 +0000 (10:35 -0800)]
Merge "Fail if the new index is out of range."
jwilson [Mon, 17 Dec 2012 18:16:33 +0000 (13:16 -0500)]
Fail if the new index is out of range.
We were silently truncating, which made an obvious problem
into a non-obvious one.
Bug: http://code.google.com/p/android/issues/detail?id=40409
Change-Id: I15576357c72ac0e98cf85c0a1d289fd5009468f9
Elliott Hughes [Mon, 17 Dec 2012 17:32:41 +0000 (09:32 -0800)]
am
3145fe89: am
48b95902: Merge "Possible leak in dvmAllocRegion"
* commit '
3145fe8969fdd0993b47eb27339f06be44198d86':
Possible leak in dvmAllocRegion
Elliott Hughes [Mon, 17 Dec 2012 17:29:55 +0000 (09:29 -0800)]
am
48b95902: Merge "Possible leak in dvmAllocRegion"
* commit '
48b9590264d6f7ca683385c6fac6d98e6d9735fb':
Possible leak in dvmAllocRegion
Elliott Hughes [Mon, 17 Dec 2012 17:21:54 +0000 (09:21 -0800)]
Remove dead code.
Change-Id: I56c27c510c8fc0ba2d8e691c788b433dce250f7a
Elliott Hughes [Mon, 17 Dec 2012 17:17:29 +0000 (09:17 -0800)]
am
023fad2a: am
193a551a: Merge "Fix handling of annotations whose classes are missing at runtime."
* commit '
023fad2a6f7c600d56222c95980d83b5e7f8b9e4':
Fix handling of annotations whose classes are missing at runtime.
Elliott Hughes [Mon, 17 Dec 2012 17:16:35 +0000 (09:16 -0800)]
Merge "Possible leak in dvmAllocRegion"
Elliott Hughes [Mon, 17 Dec 2012 17:15:40 +0000 (09:15 -0800)]
am
193a551a: Merge "Fix handling of annotations whose classes are missing at runtime."
* commit '
193a551a1b699e96f5bc6ccdcba36aa175d1c4bd':
Fix handling of annotations whose classes are missing at runtime.
Elliott Hughes [Mon, 17 Dec 2012 17:09:01 +0000 (09:09 -0800)]
Merge "Fix handling of annotations whose classes are missing at runtime."
Elliott Hughes [Sat, 15 Dec 2012 01:27:24 +0000 (17:27 -0800)]
Fix handling of annotations whose classes are missing at runtime.
Bug: http://code.google.com/p/android/issues/detail?id=39854
Change-Id: I3089b693ff3084b093f991f991ac9273dea7356d
You Kim [Mon, 17 Dec 2012 15:14:07 +0000 (00:14 +0900)]
Possible leak in dvmAllocRegion
In error case mmapped ptr 'base' is not munmapped.
Change-Id: I9e43841371fee6b7c092fe9a8922ae82e78805ed
You Kim [Thu, 22 Nov 2012 14:51:38 +0000 (23:51 +0900)]
Optimize opcodes to avoid bubble in pipeline.
Possible bubbles between fetch(ldr) and extract(and)
Excute subsequent instruction(s) inbetween the bubble by reordering instruction.
Change-Id: I76d89ed6bc4ca44673231375cc529fdbfd5a8030
Elliott Hughes [Mon, 10 Dec 2012 23:23:24 +0000 (15:23 -0800)]
am
2f68d32a: am
eeae8a89: Merge "ExceptionInInitializerError should wrap only non Error exceptions."
* commit '
2f68d32aa3d5e925827974a943f472ea4f0702e1':
ExceptionInInitializerError should wrap only non Error exceptions.
Elliott Hughes [Mon, 10 Dec 2012 23:21:47 +0000 (15:21 -0800)]
am
eeae8a89: Merge "ExceptionInInitializerError should wrap only non Error exceptions."
* commit '
eeae8a8926f647133dc858661b5b167595cf7f30':
ExceptionInInitializerError should wrap only non Error exceptions.
Elliott Hughes [Mon, 10 Dec 2012 23:05:11 +0000 (15:05 -0800)]
Merge "ExceptionInInitializerError should wrap only non Error exceptions."
Elliott Hughes [Mon, 10 Dec 2012 22:51:07 +0000 (14:51 -0800)]
ExceptionInInitializerError should wrap only non Error exceptions.
Backport from dalvik-dev, due to customer demand.
Bug: http://code.google.com/p/android/issues/detail?id=41196
Change-Id: I53ef57e54983f2173546463ac78e265ff5dd3284
Elliott Hughes [Fri, 7 Dec 2012 20:24:10 +0000 (12:24 -0800)]
am
ccfe46a9: am
74eb48fe: Merge "Don\'t cache failures in the interface cache."
* commit '
ccfe46a912434036b109394d669574afe7adde20':
Don't cache failures in the interface cache.
Elliott Hughes [Fri, 7 Dec 2012 20:24:09 +0000 (12:24 -0800)]
am
7eeb0166: am
c2228b7f: Merge "Remove dvmFindInterfaceMethodInCache2."
* commit '
7eeb0166e5574ada535b9fe5f404f388a6d6854a':
Remove dvmFindInterfaceMethodInCache2.
Elliott Hughes [Fri, 7 Dec 2012 20:19:02 +0000 (12:19 -0800)]
am
74eb48fe: Merge "Don\'t cache failures in the interface cache."
* commit '
74eb48fe1a362b763461bf36d31c9d901a7866b6':
Don't cache failures in the interface cache.
Elliott Hughes [Fri, 7 Dec 2012 20:19:01 +0000 (12:19 -0800)]
am
c2228b7f: Merge "Remove dvmFindInterfaceMethodInCache2."
* commit '
c2228b7feb1ed2b143666ae1a664c1cc4188ec48':
Remove dvmFindInterfaceMethodInCache2.
Elliott Hughes [Fri, 7 Dec 2012 00:43:18 +0000 (16:43 -0800)]
Merge "Don't cache failures in the interface cache."
Elliott Hughes [Fri, 7 Dec 2012 00:33:38 +0000 (16:33 -0800)]
Don't cache failures in the interface cache.
If we try to reuse a failure, we'll be holding a NULL Method* without
the current thread having the appropriate exception pending, which will
lead to a SIGSEGV.
I've added a corresponding vm-test to cts/.
Bug: http://code.google.com/p/android/issues/detail?id=29358
Change-Id: I044e438c46fce256c8eff2dac5d86778734d5614
Elliott Hughes [Thu, 6 Dec 2012 23:37:19 +0000 (15:37 -0800)]
Merge "Remove dvmFindInterfaceMethodInCache2."
Elliott Hughes [Thu, 6 Dec 2012 23:24:32 +0000 (15:24 -0800)]
Remove dvmFindInterfaceMethodInCache2.
We can just use dvmFindInterfaceMethodInCache directly.
Change-Id: I2f3a660262ba7a39c05689df160ebdd2e7ec38a5
Elliott Hughes [Fri, 30 Nov 2012 23:01:56 +0000 (15:01 -0800)]
am
b22ae7df: am
318e4faf: Merge "JIT: Performance fix for const doubles"
* commit '
b22ae7df598f21a5577d61a4718b0217db523de0':
JIT: Performance fix for const doubles
Elliott Hughes [Fri, 30 Nov 2012 22:59:12 +0000 (14:59 -0800)]
am
318e4faf: Merge "JIT: Performance fix for const doubles"
* commit '
318e4faf2a3c3b6a7b4bc442c9220160f21972e3':
JIT: Performance fix for const doubles
Elliott Hughes [Fri, 30 Nov 2012 22:52:23 +0000 (14:52 -0800)]
Merge "JIT: Performance fix for const doubles"
buzbee [Fri, 30 Nov 2012 14:46:45 +0000 (06:46 -0800)]
JIT: Performance fix for const doubles
Some recent Arm processors take a performance hit when
creating a floating point double by loading it as a pair of singles.
Legacy code to support soft floating point doubles as a pair of core
registers loaded double immediates in this way.
With the CL, we handle double immediates as a single unit.
(cherry-pick of
c8129911e598ad0ca8d7b31012444ab6ce8bce45.)
Change-Id: Ic1512e34bfd233a6f5ffd58ce843965adbbad875
Elliott Hughes [Fri, 30 Nov 2012 20:55:57 +0000 (12:55 -0800)]
am
9a333e1a: am
c375ac33: Merge "Use ALOGE rather than SLOGE for mountEmulatedStorage failures."
* commit '
9a333e1a01f8f1d5c8812ff95b6a3b6a617a8f45':
Use ALOGE rather than SLOGE for mountEmulatedStorage failures.
Elliott Hughes [Fri, 30 Nov 2012 20:39:50 +0000 (12:39 -0800)]
am
c375ac33: Merge "Use ALOGE rather than SLOGE for mountEmulatedStorage failures."
* commit '
c375ac332911cfea8e6570e2681cf79ad5220edb':
Use ALOGE rather than SLOGE for mountEmulatedStorage failures.
buzbee [Fri, 30 Nov 2012 20:25:59 +0000 (12:25 -0800)]
Merge "JIT: Performance fix for const doubles"
buzbee [Fri, 30 Nov 2012 14:46:45 +0000 (06:46 -0800)]
JIT: Performance fix for const doubles
Some recent Arm processors take a performance hit when
creating a floating point double by loading it as a pair of singles.
Legacy code to support soft floating point doubles as a pair of core
registers loaded double immediates in this way.
With the CL, we handle double immediates as a single unit.
Change-Id: I91aca9da6d4b38e180479dd8f75c82dbc7b4a526
Elliott Hughes [Fri, 30 Nov 2012 19:46:25 +0000 (11:46 -0800)]
Merge "Use ALOGE rather than SLOGE for mountEmulatedStorage failures."
Elliott Hughes [Fri, 30 Nov 2012 19:36:25 +0000 (11:36 -0800)]
Use ALOGE rather than SLOGE for mountEmulatedStorage failures.
Otherwise the actual failure isn't in logcat, and all you see there
is the rather confusing:
E dalvikvm: cannot mountExternalStorage(): Success
Change-Id: I10c96748b5ff5b6c3877312e7bdb2641026b4489
Elliott Hughes [Thu, 29 Nov 2012 17:49:31 +0000 (09:49 -0800)]
am
89dbb7f1: am
0b4e2c8c: Merge "remove duplicated call to dvmJitCalleeSave()"
* commit '
89dbb7f194f45fb3c649877b32763ea785255897':
remove duplicated call to dvmJitCalleeSave()
Elliott Hughes [Thu, 29 Nov 2012 17:11:00 +0000 (09:11 -0800)]
am
0b4e2c8c: Merge "remove duplicated call to dvmJitCalleeSave()"
* commit '
0b4e2c8cd485551a764910864fa1fdac389ce8bf':
remove duplicated call to dvmJitCalleeSave()
Elliott Hughes [Thu, 29 Nov 2012 16:57:40 +0000 (08:57 -0800)]
Merge "remove duplicated call to dvmJitCalleeSave()"
Rocky Zhang [Thu, 29 Nov 2012 00:02:29 +0000 (08:02 +0800)]
remove duplicated call to dvmJitCalleeSave()
Change-Id: Ib7b5f637a22fd5ba60bdb45cd34ac8c1781c7bd3
Signed-off-by: Rocky Zhang <zhangyan.hit@gmail.com>
Elliott Hughes [Wed, 28 Nov 2012 02:43:31 +0000 (18:43 -0800)]
am
504c0664: am
32155bb0: Merge "[MIPS] Fix DDMS(profiling) bug."
* commit '
504c0664773260629f452024d107098ecabca825':
[MIPS] Fix DDMS(profiling) bug.
Elliott Hughes [Wed, 28 Nov 2012 02:43:30 +0000 (18:43 -0800)]
am
48ef458a: am
7f98dcfc: Merge "[MIPS] Fix several profiling issues caused by incorrect register saves"
* commit '
48ef458aa0fa9ee72fa0ce47e908720f52e2c2f3':
[MIPS] Fix several profiling issues caused by incorrect register saves
Elliott Hughes [Wed, 28 Nov 2012 02:43:22 +0000 (18:43 -0800)]
am
cac964aa: am
49761fc0: Merge "[MIPS] Fixing FP registers fs0 and fs1 corruption bug."
* commit '
cac964aaf036a7e5390121ad61b7341db50689b5':
[MIPS] Fixing FP registers fs0 and fs1 corruption bug.
Elliott Hughes [Tue, 27 Nov 2012 22:55:16 +0000 (14:55 -0800)]
am
32155bb0: Merge "[MIPS] Fix DDMS(profiling) bug."
* commit '
32155bb0b07f3865173978f488d775e59a471b81':
[MIPS] Fix DDMS(profiling) bug.
Elliott Hughes [Tue, 27 Nov 2012 22:55:15 +0000 (14:55 -0800)]
am
7f98dcfc: Merge "[MIPS] Fix several profiling issues caused by incorrect register saves"
* commit '
7f98dcfc19848e061ed1291190c5619b092a3fb0':
[MIPS] Fix several profiling issues caused by incorrect register saves
Elliott Hughes [Tue, 27 Nov 2012 22:39:22 +0000 (14:39 -0800)]
am
49761fc0: Merge "[MIPS] Fixing FP registers fs0 and fs1 corruption bug."
* commit '
49761fc08d04f784f2499c05785cd5e524b9e431':
[MIPS] Fixing FP registers fs0 and fs1 corruption bug.
Elliott Hughes [Tue, 27 Nov 2012 22:37:03 +0000 (14:37 -0800)]
Merge "[MIPS] Fix DDMS(profiling) bug."
Elliott Hughes [Tue, 27 Nov 2012 22:36:45 +0000 (14:36 -0800)]
Merge "[MIPS] Fix several profiling issues caused by incorrect register saves"
Elliott Hughes [Tue, 27 Nov 2012 22:35:39 +0000 (14:35 -0800)]
Merge "[MIPS] Fixing FP registers fs0 and fs1 corruption bug."
The Android Open Source Project [Tue, 27 Nov 2012 16:25:04 +0000 (08:25 -0800)]
am
92e57e16: (-s ours) am
a6f7a22e: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge
* commit '
92e57e16f12a38f231dce32bb80e83dd13399160':
The Android Open Source Project [Tue, 27 Nov 2012 16:22:36 +0000 (08:22 -0800)]
am
a6f7a22e: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge
* commit '
a6f7a22e9902ce6e550ca0650caaecb69d963135':
The Android Open Source Project [Tue, 27 Nov 2012 16:20:15 +0000 (08:20 -0800)]
Merge jb-mr1-dev into aosp/master - do not merge
Change-Id: Idf370f9acc8ecddd2d9c73a41691c65da457ffc0
Douglas Leung [Tue, 27 Nov 2012 02:57:38 +0000 (18:57 -0800)]
[MIPS] Fixing FP registers fs0 and fs1 corruption bug.
For performance reasons, we don't want to use "callee saved" FP registers.
The fix is to just use temporary FP registers instead.
Change-Id: Ifae20c707ff7022905a080892348bfbc151e4935
Signed-off-by: Douglas Leung <douglas@mips.com>
Douglas Leung [Thu, 22 Nov 2012 03:13:14 +0000 (19:13 -0800)]
[MIPS] Fix DDMS(profiling) bug.
Change-Id: I47e87d600dc6eb529bf1ae9c8cc2b81910b9513c
Signed-off-by: Douglas Leung <douglas@mips.com>
Chris Dearman [Thu, 22 Nov 2012 03:08:34 +0000 (19:08 -0800)]
[MIPS] Fix several profiling issues caused by incorrect register saves
rTEMP is used by the JAL and JALR macros so it needs to be preserved
if it is holding some other useful value. No need to save ra in rTEMP
if using JAL/JALR macros.
Change-Id: I1bf8c3b044faa944021b4331e0a71c1489b70241
Signed-off-by: Douglas Leung <douglas@mips.com>
Signed-off-by: Chris Dearman <chris@mips.com>
Yohann Roussel [Mon, 12 Nov 2012 20:19:18 +0000 (12:19 -0800)]
am
ac0dce8c: (-s ours) am
f118a9fc: am
a3df5b58: am
b6f4e037: am
afe3a013: (-s ours) am
288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."
* commit '
ac0dce8c92f7001a906ebee19a773181373c0f61':
Revert "Fix alignment when recompacting a DexMerger result. do not merge."
yroussel [Mon, 12 Nov 2012 20:19:16 +0000 (12:19 -0800)]
am
e4df189b: (-s ours) am
96cdc4ca: am
ce0723cc: am
437f58a5: am
2d2f13c5: (-s ours) am
707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.
* commit '
e4df189b4db1024bb371cf210d4062c0df8d07b5':
Fix alignment when recompacting a DexMerger result. do not merge.
Yohann Roussel [Mon, 12 Nov 2012 20:16:36 +0000 (12:16 -0800)]
am
f118a9fc: am
a3df5b58: am
b6f4e037: am
afe3a013: (-s ours) am
288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."
* commit '
f118a9fce9f661406835d4e218db91b04bd923dc':
Revert "Fix alignment when recompacting a DexMerger result. do not merge."
yroussel [Mon, 12 Nov 2012 20:16:35 +0000 (12:16 -0800)]
am
96cdc4ca: am
ce0723cc: am
437f58a5: am
2d2f13c5: (-s ours) am
707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.
* commit '
96cdc4cacdae25302cb5ec79e43063140411cbb7':
Fix alignment when recompacting a DexMerger result. do not merge.
Yohann Roussel [Mon, 12 Nov 2012 20:13:55 +0000 (12:13 -0800)]
am
a3df5b58: am
b6f4e037: am
afe3a013: (-s ours) am
288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."
* commit '
a3df5b58369667f2fb3c4616f7e175b6ec7db412':
Revert "Fix alignment when recompacting a DexMerger result. do not merge."
yroussel [Mon, 12 Nov 2012 20:13:54 +0000 (12:13 -0800)]
am
ce0723cc: am
437f58a5: am
2d2f13c5: (-s ours) am
707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.
* commit '
ce0723cc425223c0e93ab0ce1968822c5ef9d352':
Fix alignment when recompacting a DexMerger result. do not merge.
Yohann Roussel [Mon, 12 Nov 2012 20:10:29 +0000 (12:10 -0800)]
am
b6f4e037: am
afe3a013: (-s ours) am
288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."
* commit '
b6f4e0372154191bdf1ee32727aead1fe1200cbc':
Revert "Fix alignment when recompacting a DexMerger result. do not merge."
yroussel [Mon, 12 Nov 2012 20:10:28 +0000 (12:10 -0800)]
am
437f58a5: am
2d2f13c5: (-s ours) am
707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.
* commit '
437f58a5d25d76aa035c53e341e2516e39a70927':
Fix alignment when recompacting a DexMerger result. do not merge.
Yohann Roussel [Mon, 12 Nov 2012 20:07:44 +0000 (12:07 -0800)]
am
afe3a013: (-s ours) am
288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."
* commit '
afe3a0131e75367759e1d7a69cec0aac2a45524c':
Revert "Fix alignment when recompacting a DexMerger result. do not merge."
yroussel [Mon, 12 Nov 2012 20:07:43 +0000 (12:07 -0800)]
am
2d2f13c5: (-s ours) am
707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.
* commit '
2d2f13c50ba3c38dc4a8a8aaf483f6df155e0080':
Fix alignment when recompacting a DexMerger result. do not merge.
The Android Open Source Project [Mon, 12 Nov 2012 15:41:36 +0000 (07:41 -0800)]
am
15d51db1: (-s ours) am
d9de2f66: am
bb077798: Reconcile with jb-mr1-release - do not merge
* commit '
15d51db11420b8ec3dd885f5e790dab6b79ce1be':
The Android Open Source Project [Mon, 12 Nov 2012 15:39:27 +0000 (07:39 -0800)]
am
d9de2f66: am
bb077798: Reconcile with jb-mr1-release - do not merge
* commit '
d9de2f6652a8a7f7d5b348bccd7b842ac3d5716d':
The Android Open Source Project [Mon, 12 Nov 2012 15:38:44 +0000 (07:38 -0800)]
am
d5792c2f: (-s ours) am
d5c3cb5f: am
890e41c1: Merge
f870f2d - do not merge
* commit '
d5792c2f45abcf8cf554fed1c417fda416088f5d':
Add dx option to always generate const-string/jumbo.do not merge.
The Android Open Source Project [Mon, 12 Nov 2012 15:37:02 +0000 (07:37 -0800)]
am
bb077798: Reconcile with jb-mr1-release - do not merge
* commit '
bb07779818b583ec6d0b73c4062f485751332c81':
The Android Open Source Project [Mon, 12 Nov 2012 15:35:32 +0000 (07:35 -0800)]
am
d5c3cb5f: am
890e41c1: Merge
f870f2d - do not merge
* commit '
d5c3cb5f23429cf4e1c7b08c5e926174a64b4703':
Add dx option to always generate const-string/jumbo.do not merge.
The Android Open Source Project [Mon, 12 Nov 2012 15:35:23 +0000 (07:35 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ic0fb72b0939908c2e072e4ae5d60c9d24de9dc66
The Android Open Source Project [Mon, 12 Nov 2012 15:33:04 +0000 (07:33 -0800)]
am
890e41c1: Merge
f870f2d - do not merge
* commit '
890e41c1c4289b97476bc90d2e1e443fffec4b13':
Add dx option to always generate const-string/jumbo.do not merge.
The Android Open Source Project [Mon, 12 Nov 2012 15:29:38 +0000 (07:29 -0800)]
Merge
f870f2d - do not merge
Change-Id: Ib8ea0f0d579f78fcab1deca05ff1beac9ba9bc03
The Android Automerger [Sat, 10 Nov 2012 00:25:17 +0000 (16:25 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
jeffhao [Tue, 16 Oct 2012 00:04:46 +0000 (17:04 -0700)]
Add dx option to always generate const-string/jumbo.do not merge.
This allows large dex files with many strings to be merged properly.
(cherry picked from commit
266f45ff7da18022faf5f77df76c69f8cdad313f)
Change-Id: I5fe4c55d84a91101a4f89f590117aa6dc0bfc0f2
Elliott Hughes [Wed, 7 Nov 2012 21:08:13 +0000 (13:08 -0800)]
am
78a9a372: am
6bc15e50: Merge "Fix x86 JIT log spam."
* commit '
78a9a372ebf079a2a0e73151134b6467b1e3a3e0':
Fix x86 JIT log spam.