OSDN Git Service
Mathieu Chartier [Tue, 16 Jul 2013 22:46:42 +0000 (22:46 +0000)]
Merge "Backport native allocation tracking."
Elliott Hughes [Tue, 16 Jul 2013 22:36:11 +0000 (15:36 -0700)]
am
6986ad03: am
bc03380a: Merge "Remove an assertion that JDWP packets are small."
* commit '
6986ad0343ebe4a7379a6d726005fa550b186b5d':
Remove an assertion that JDWP packets are small.
Elliott Hughes [Tue, 16 Jul 2013 22:31:38 +0000 (15:31 -0700)]
am
bc03380a: Merge "Remove an assertion that JDWP packets are small."
* commit '
bc03380a9d5565cdef0c4b4c41fdd19813b05799':
Remove an assertion that JDWP packets are small.
Elliott Hughes [Tue, 16 Jul 2013 20:45:54 +0000 (20:45 +0000)]
Merge "Remove an assertion that JDWP packets are small."
Elliott Hughes [Tue, 16 Jul 2013 20:41:03 +0000 (13:41 -0700)]
Remove an assertion that JDWP packets are small.
Now we support longer allocation tracker runs, it's possible
to collect more than 1MiB of data.
Bug:
9871848
Change-Id: Ifb575538b97563ce909f7e0aa6840ccbd6e93569
Mathieu Chartier [Mon, 15 Jul 2013 23:58:59 +0000 (16:58 -0700)]
Backport native allocation tracking.
From:
https://googleplex-android-review.googlesource.com/#/c/328818/
Change-Id: I5a930e629c5a2062f01f870b4a44dcd98cb4ffe9
Mathieu Chartier [Wed, 10 Jul 2013 00:30:51 +0000 (17:30 -0700)]
Add low memory mode option.
Added a low memory mode option which can be enabled by passing the
flag "-XX:LowMemoryMode" to the VM.
Changed dvmHeapSourceAlloc to use mspace_malloc and madvise page
aligned regions of allocations back to the kernel if low
memory mode is enabled. No measurable performance penalty on a
benchmark which does 4 million object allocations. This seems to
reduce the Dalvik total PSS by 10 - 15% on devices with
large bitmaps (such as manta or flo).
Another change is that cards are madvised instead of memset when
cleared if low memory mode is enabled. This saves a minor amount
of memory at the cost of having slightly more page faults.
Change-Id: I0c850bc370ebabf4393bff1c47d3257b2f1518d2
Elliott Hughes [Fri, 12 Jul 2013 01:57:44 +0000 (18:57 -0700)]
am
d9369dc7: am
57914adc: am
93c3b11e: Merge "Increase the default alloc tracker maximum."
* commit '
d9369dc790004aedbd772737926329485f794548':
Increase the default alloc tracker maximum.
Elliott Hughes [Fri, 12 Jul 2013 01:55:50 +0000 (18:55 -0700)]
am
57914adc: am
93c3b11e: Merge "Increase the default alloc tracker maximum."
* commit '
57914adc7e0e09a74015c2dd0d3e98f1cc57e3ec':
Increase the default alloc tracker maximum.
Elliott Hughes [Fri, 12 Jul 2013 01:52:23 +0000 (18:52 -0700)]
am
93c3b11e: Merge "Increase the default alloc tracker maximum."
* commit '
93c3b11ea6bcc25e8f0bb6ba701c71ed05906b52':
Increase the default alloc tracker maximum.
Elliott Hughes [Fri, 12 Jul 2013 00:36:54 +0000 (00:36 +0000)]
Merge "Increase the default alloc tracker maximum."
Elliott Hughes [Fri, 12 Jul 2013 00:23:15 +0000 (17:23 -0700)]
Increase the default alloc tracker maximum.
Also add a new system property "dalvik.vm.allocTrackerMax" that allows
developers to choose an arbitrary limit.
Change-Id: I246a31d0ee46557544b1babae412246914495f80
Brian Carlstrom [Fri, 28 Jun 2013 21:38:35 +0000 (14:38 -0700)]
add dalvik.system.VMRuntime.vmLibrary implementation for Dalvik
(cherry picked from commit
70c799fc91564b497dedc408943065ed58a275bb)
Change-Id: I8392e9f9dd92420b5d5c61f83a32fae6e23ebee3
Elliott Hughes [Tue, 2 Jul 2013 20:14:29 +0000 (13:14 -0700)]
am
f8696fa7: am
2115c7ed: am
f8fe8731: Merge "Disable -Xjnigreflimit."
* commit '
f8696fa79b0bb1ecc9eea0229eb989f25feaa1c0':
Disable -Xjnigreflimit.
Elliott Hughes [Tue, 2 Jul 2013 20:13:17 +0000 (13:13 -0700)]
am
2115c7ed: am
f8fe8731: Merge "Disable -Xjnigreflimit."
* commit '
2115c7ed027f20edca0b8e0ab819c63ff16a389c':
Disable -Xjnigreflimit.
Elliott Hughes [Tue, 2 Jul 2013 20:11:33 +0000 (13:11 -0700)]
am
f8fe8731: Merge "Disable -Xjnigreflimit."
* commit '
f8fe8731a5302105b285d549e4a0265a35db3e2e':
Disable -Xjnigreflimit.
Elliott Hughes [Tue, 2 Jul 2013 20:09:00 +0000 (20:09 +0000)]
Merge "Disable -Xjnigreflimit."
Elliott Hughes [Tue, 2 Jul 2013 19:50:29 +0000 (12:50 -0700)]
Disable -Xjnigreflimit.
This was supposed to help find bugs, but in practice (unlike the
locale reference limit and the pinned array limit) doesn't. What it
does do is cause well-behaved code to fail if its allocation rate
is high. This has caused trouble for both audio and graphics code
running on eng builds.
Bug:
7903975
Change-Id: If475cb51c9cab13270a83a60d6d0aecfab758e88
Brian Carlstrom [Tue, 18 Jun 2013 20:12:05 +0000 (20:12 +0000)]
Merge "Move to new art dalvikvm"
Brian Carlstrom [Mon, 17 Jun 2013 19:52:41 +0000 (12:52 -0700)]
Move to new art dalvikvm
Change-Id: I93f66d294f6c02069dc8a539c54966ba41417ca2
Elliott Hughes [Mon, 17 Jun 2013 17:21:26 +0000 (10:21 -0700)]
am
bbd903de: am
28702c58: am
ae2fb913: Merge "JIT: Use rsb and shift in easy multiply."
* commit '
bbd903dec7c25859849fa447aaeef365f20440d4':
JIT: Use rsb and shift in easy multiply.
Elliott Hughes [Mon, 17 Jun 2013 17:18:54 +0000 (10:18 -0700)]
am
28702c58: am
ae2fb913: Merge "JIT: Use rsb and shift in easy multiply."
* commit '
28702c58c9af24f735091ea83243af012956099e':
JIT: Use rsb and shift in easy multiply.
Elliott Hughes [Mon, 17 Jun 2013 17:17:03 +0000 (10:17 -0700)]
am
ae2fb913: Merge "JIT: Use rsb and shift in easy multiply."
* commit '
ae2fb91351509897699a29ae54a3d120a90b62ec':
JIT: Use rsb and shift in easy multiply.
Elliott Hughes [Mon, 17 Jun 2013 17:14:21 +0000 (17:14 +0000)]
Merge "JIT: Use rsb and shift in easy multiply."
Elliott Hughes [Fri, 14 Jun 2013 17:47:25 +0000 (10:47 -0700)]
am
d189d8ca: am
6fb2ea56: am
2f0ce6ab: Merge "Fix inner class access flags and array modifiers."
* commit '
d189d8ca6ef2be53e80247c735ffb38279ae3f0f':
Fix inner class access flags and array modifiers.
Elliott Hughes [Fri, 14 Jun 2013 17:45:27 +0000 (10:45 -0700)]
am
6fb2ea56: am
2f0ce6ab: Merge "Fix inner class access flags and array modifiers."
* commit '
6fb2ea567970f155386c6c0301a94142a954cc27':
Fix inner class access flags and array modifiers.
Elliott Hughes [Fri, 14 Jun 2013 17:44:06 +0000 (10:44 -0700)]
am
2f0ce6ab: Merge "Fix inner class access flags and array modifiers."
* commit '
2f0ce6ab114b1036b06c4bd425cd01cb509260bd':
Fix inner class access flags and array modifiers.
Elliott Hughes [Fri, 14 Jun 2013 17:41:43 +0000 (17:41 +0000)]
Merge "Fix inner class access flags and array modifiers."
Elliott Hughes [Fri, 14 Jun 2013 01:57:33 +0000 (18:57 -0700)]
Fix inner class access flags and array modifiers.
Inner class access flags should come from the InnerClass attribute.
Array classes should all have the ACC_ABSTRACT modifier set.
Bug: https://code.google.com/p/android/issues/detail?id=56267
Change-Id: If4793ee6c7a6b24bf4d32ef05167d81b58011188
Jean-Baptiste Queru [Fri, 14 Jun 2013 16:11:23 +0000 (09:11 -0700)]
am
11c768b7: (-s ours) am
60d1c05b: am
eb82cca7: (-s ours) am
381868f3: (-s ours) am
840d233c: am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
11c768b7ad45e20d9182e8fe2063b3643219b400':
Jean-Baptiste Queru [Fri, 14 Jun 2013 15:35:51 +0000 (08:35 -0700)]
am
60d1c05b: am
eb82cca7: (-s ours) am
381868f3: (-s ours) am
840d233c: am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
60d1c05bc70c5a3acf2f345cf434524aecdeab43':
Jean-Baptiste Queru [Fri, 14 Jun 2013 15:34:02 +0000 (08:34 -0700)]
am
eb82cca7: (-s ours) am
381868f3: (-s ours) am
840d233c: am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
eb82cca7f4b40bfb9aada2dfa56595d9e3ff1eda':
Anders O Nilsson [Wed, 10 Oct 2012 13:26:32 +0000 (15:26 +0200)]
JIT: Use rsb and shift in easy multiply.
For easy multiplication using reverse subtract (when
lit is 2^n-1) use the barrel shifter for rsb.
This improves arithmetic performance for code executing
in Dalvik. E.g String.hashCode.
Change-Id: Ifb086dcec344b30fd3e392ac21d508b43e820cdc
Signed-off-by: Patrik Ryd <patrik.ryd@stericsson.com>
Jean-Baptiste Queru [Fri, 14 Jun 2013 05:33:07 +0000 (22:33 -0700)]
am
381868f3: (-s ours) am
840d233c: am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
381868f347d413a671a6ad9c0af64d258a060b99':
Jean-Baptiste Queru [Fri, 14 Jun 2013 05:31:29 +0000 (22:31 -0700)]
am
840d233c: am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
840d233c12200de9260c85d6eadbc73b41cef00b':
Jean-Baptiste Queru [Fri, 14 Jun 2013 04:07:35 +0000 (21:07 -0700)]
am
800e4320: am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
800e4320ba0815bfe7831deab99f5d600800663f':
Jean-Baptiste Queru [Fri, 14 Jun 2013 01:07:45 +0000 (18:07 -0700)]
am
63c34b5e: am
68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
63c34b5e2aae446b76fdf34f0ff895e35cd7376a':
Elliott Hughes [Thu, 13 Jun 2013 21:49:44 +0000 (14:49 -0700)]
am
15139109: am
6529809b: Merge "JIT: Allow use of cbz/cbnz for conditional branch gen."
* commit '
151391097e94585d4dd062098438e5c894b98d6d':
JIT: Allow use of cbz/cbnz for conditional branch gen.
Elliott Hughes [Thu, 13 Jun 2013 21:46:07 +0000 (14:46 -0700)]
am
6529809b: Merge "JIT: Allow use of cbz/cbnz for conditional branch gen."
* commit '
6529809bd4448a76622a08cf63829cab73d91b9a':
JIT: Allow use of cbz/cbnz for conditional branch gen.
Elliott Hughes [Thu, 13 Jun 2013 21:43:55 +0000 (21:43 +0000)]
Merge "JIT: Allow use of cbz/cbnz for conditional branch gen."
Elliott Hughes [Tue, 11 Jun 2013 18:07:24 +0000 (11:07 -0700)]
am
70605c75: am
a163f4a9: Merge "Now that abort(3) is fixed, dvmAbort can be simplified."
* commit '
70605c75b9418a3ef0450ba37bcf29a0c61609b4':
Now that abort(3) is fixed, dvmAbort can be simplified.
Elliott Hughes [Tue, 11 Jun 2013 18:03:21 +0000 (11:03 -0700)]
am
a163f4a9: Merge "Now that abort(3) is fixed, dvmAbort can be simplified."
* commit '
a163f4a944cc040aaf25f92ae9c28c1e9cf981f8':
Now that abort(3) is fixed, dvmAbort can be simplified.
Elliott Hughes [Tue, 11 Jun 2013 18:01:49 +0000 (18:01 +0000)]
Merge "Now that abort(3) is fixed, dvmAbort can be simplified."
Elliott Hughes [Tue, 11 Jun 2013 17:52:34 +0000 (10:52 -0700)]
Now that abort(3) is fixed, dvmAbort can be simplified.
The fix to abort(3) has SHA
7e6ce1a3c52d8533fed92c143419fedb0c93988a.
(https://android-review.googlesource.com/#/c/60341/)
Change-Id: I89e7ed174cbd08ad9046a98e2fdd73af8ae3ee5c
Brian Carlstrom [Sat, 8 Jun 2013 00:36:51 +0000 (17:36 -0700)]
am
520f6ab1: am
6531a977: Merge "Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library."
* commit '
520f6ab13b56bdaeb21ac99d105ac59a052539a7':
Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library.
Brian Carlstrom [Fri, 7 Jun 2013 22:38:01 +0000 (15:38 -0700)]
am
6531a977: Merge "Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library."
* commit '
6531a9771a6b5bf32ea1a5febc067c8d39dede5f':
Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library.
Brian Carlstrom [Fri, 7 Jun 2013 22:35:56 +0000 (22:35 +0000)]
Merge "Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library."
Elliott Hughes [Wed, 31 Aug 2011 17:29:38 +0000 (10:29 -0700)]
Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library.
(cherry picked from commit
0f526895f34904784e3d2ef964b016d2764cb662)
Change-Id: I4f6f22e782e58a9b21af68aab1cebc21b3437976
Elliott Hughes [Wed, 5 Jun 2013 21:21:13 +0000 (14:21 -0700)]
am
e421d118: am
007c01f8: Merge "Fix a minor leak in dvmCreateInlineSubsTable"
* commit '
e421d1188052f89988d6774b5375cf844dea1cd0':
Fix a minor leak in dvmCreateInlineSubsTable
Elliott Hughes [Wed, 5 Jun 2013 21:17:24 +0000 (14:17 -0700)]
am
619965a0: am
1da7fec6: Merge "Fix minor leaks caused by failed initialization in JNI_CreateJavaVM"
* commit '
619965a0c6e49f6fc29a3cd15052eb4ded9348b9':
Fix minor leaks caused by failed initialization in JNI_CreateJavaVM
Elliott Hughes [Wed, 5 Jun 2013 21:14:16 +0000 (14:14 -0700)]
am
007c01f8: Merge "Fix a minor leak in dvmCreateInlineSubsTable"
* commit '
007c01f862019fa4703cd0b3289b3cc26d4ad452':
Fix a minor leak in dvmCreateInlineSubsTable
Elliott Hughes [Wed, 5 Jun 2013 21:13:00 +0000 (21:13 +0000)]
Merge "Fix a minor leak in dvmCreateInlineSubsTable"
Elliott Hughes [Wed, 5 Jun 2013 21:11:03 +0000 (14:11 -0700)]
am
1da7fec6: Merge "Fix minor leaks caused by failed initialization in JNI_CreateJavaVM"
* commit '
1da7fec6c97623822c159ed7a8bbcce89db63119':
Fix minor leaks caused by failed initialization in JNI_CreateJavaVM
Elliott Hughes [Wed, 5 Jun 2013 21:10:33 +0000 (14:10 -0700)]
am
784f34d6: am
f6944312: Merge "Fix a minor bug in dvmCreateInterpThread"
* commit '
784f34d6badf691a14ea121405fb0632182f81de':
Fix a minor bug in dvmCreateInterpThread
Elliott Hughes [Wed, 5 Jun 2013 21:09:03 +0000 (21:09 +0000)]
Merge "Fix minor leaks caused by failed initialization in JNI_CreateJavaVM"
Elliott Hughes [Wed, 5 Jun 2013 21:04:35 +0000 (14:04 -0700)]
am
f6944312: Merge "Fix a minor bug in dvmCreateInterpThread"
* commit '
f694431279501527cc3271d50b619533000dbd8f':
Fix a minor bug in dvmCreateInterpThread
Elliott Hughes [Wed, 5 Jun 2013 21:02:50 +0000 (21:02 +0000)]
Merge "Fix a minor bug in dvmCreateInterpThread"
Elliott Hughes [Wed, 5 Jun 2013 20:36:16 +0000 (13:36 -0700)]
am
de241376: am
91027c67: Merge "Remove unused compiler templates for armv7-a*"
* commit '
de2413762e3626039cadf270479f30dea6307fe8':
Remove unused compiler templates for armv7-a*
Elliott Hughes [Wed, 5 Jun 2013 20:32:48 +0000 (13:32 -0700)]
am
91027c67: Merge "Remove unused compiler templates for armv7-a*"
* commit '
91027c67a3924429bc6fc94a7f28893d9d09c900':
Remove unused compiler templates for armv7-a*
Elliott Hughes [Wed, 5 Jun 2013 20:30:48 +0000 (20:30 +0000)]
Merge "Remove unused compiler templates for armv7-a*"
Elliott Hughes [Wed, 5 Jun 2013 20:26:47 +0000 (13:26 -0700)]
am
b91f922c: am
f3079bda: Merge "Rename unreasonable function name dmvCompilerTemplateEnd"
* commit '
b91f922c80b454fa579deaee262bdd51225b82ee':
Rename unreasonable function name dmvCompilerTemplateEnd
Elliott Hughes [Wed, 5 Jun 2013 20:23:28 +0000 (13:23 -0700)]
am
f3079bda: Merge "Rename unreasonable function name dmvCompilerTemplateEnd"
* commit '
f3079bdadf30d93b37e0a59a8787c636027a36f5':
Rename unreasonable function name dmvCompilerTemplateEnd
Elliott Hughes [Wed, 5 Jun 2013 20:22:09 +0000 (20:22 +0000)]
Merge "Rename unreasonable function name dmvCompilerTemplateEnd"
Yanchuan Nian [Tue, 21 May 2013 02:41:51 +0000 (10:41 +0800)]
Rename unreasonable function name dmvCompilerTemplateEnd
In dalvik, most function names start with "dvm" except dmvCompilerTemplateEnd.
Convert it to dvmCompilerTemplateEnd in order to follow the rule.
Change-Id: I09c41f8c9d55058013fbdb62ac5922ccd067ce39
buzbee [Fri, 24 May 2013 13:02:32 +0000 (13:02 +0000)]
Merge "JIT tuning; set cache size on command line"
buzbee [Thu, 23 May 2013 20:53:50 +0000 (13:53 -0700)]
JIT tuning; set cache size on command line
The tuning knobs for triggering trace compilation for the JIT
had not been revisited for several years. In that time, the
working set of some applications have significantly increased,
leading to frequent cache overlows & flushes.
This CL adds the ability to set the maximum size of the JIT's
cache on the command line, and we expect to use different settings
depending on device configuration (rule of thumb: 1K for each 1M
for system RAM, with 2M limit).
Additionally, the trace compilation trigger has been tightened to
limit the compilation of cold traces.
Change-Id: Ice22c5d9d46a93e465c57dd83f50ca3912f1672e
Brian Carlstrom [Wed, 22 May 2013 19:52:09 +0000 (12:52 -0700)]
Remove jdwpspy from dalvik as it has been added to art
Change-Id: I59e5cd2a49a912bbd7ccfea0c6d6c2d10ec6fc99
Brian Carlstrom [Wed, 22 May 2013 19:36:36 +0000 (12:36 -0700)]
am
8c44176c: am
8eac07c9: Merge "Move jdwpspy from development to dalvik (2 of 2)"
* commit '
8c44176ceda51ac586346a64a5ce3af2c0e66624':
Move jdwpspy from development to dalvik (2 of 2)
Brian Carlstrom [Wed, 22 May 2013 19:30:32 +0000 (12:30 -0700)]
am
8eac07c9: Merge "Move jdwpspy from development to dalvik (2 of 2)"
* commit '
8eac07c961fbdb745a36cb182d58ac83ad5ba819':
Move jdwpspy from development to dalvik (2 of 2)
Brian Carlstrom [Wed, 22 May 2013 19:22:14 +0000 (19:22 +0000)]
Merge "Move jdwpspy from development to dalvik (2 of 2)"
Brian Carlstrom [Wed, 22 May 2013 04:07:08 +0000 (21:07 -0700)]
Move jdwpspy from development to dalvik (2 of 2)
Change-Id: I3e7a255fddcec1380fce143004cbad83a69d2c0d
Jean-Philippe Lesot [Fri, 17 May 2013 07:40:04 +0000 (00:40 -0700)]
am
c5e4f6bb: am
97208a0b: Merge "Added support for version 51 class files in dx"
* commit '
c5e4f6bb17ee5a14de139f2780a06329d49554eb':
Added support for version 51 class files in dx
Jean-Philippe Lesot [Fri, 17 May 2013 07:40:03 +0000 (00:40 -0700)]
am
879faf41: am
467f7e3a: Merge "Report problems as errors in dx (with exit codes)"
* commit '
879faf41e2106d2bf9f59adc0df4263e4014ff2d':
Report problems as errors in dx (with exit codes)
Jean-Philippe Lesot [Fri, 17 May 2013 07:38:04 +0000 (00:38 -0700)]
am
97208a0b: Merge "Added support for version 51 class files in dx"
* commit '
97208a0be35a4b9583172dc853150a32bb138f15':
Added support for version 51 class files in dx
Jean-Philippe Lesot [Fri, 17 May 2013 07:38:03 +0000 (00:38 -0700)]
am
467f7e3a: Merge "Report problems as errors in dx (with exit codes)"
* commit '
467f7e3aaf8aafe324744bfd825fe9941862b7b7':
Report problems as errors in dx (with exit codes)
Jean-Philippe Lesot [Fri, 17 May 2013 07:26:19 +0000 (07:26 +0000)]
Merge "Added support for version 51 class files in dx"
Jean-Philippe Lesot [Fri, 17 May 2013 07:25:05 +0000 (07:25 +0000)]
Merge "Report problems as errors in dx (with exit codes)"
You Kim [Thu, 16 May 2013 17:43:09 +0000 (02:43 +0900)]
Remove unused compiler templates for armv7-a*
Change-Id: I68e344c2f2689347d6eeb943030b7263a55cd0bd
The Android Open Source Project [Thu, 16 May 2013 12:44:27 +0000 (05:44 -0700)]
am
9fc96fac: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
9fc96facfd38ae616ae02ad4c54e5114cc088540':
The Android Open Source Project [Thu, 16 May 2013 12:43:00 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia4ccbf9977ed38b3283b26b2c7f889d942eebde6
delphinemartin [Fri, 26 Apr 2013 15:46:50 +0000 (17:46 +0200)]
Report problems as errors in dx (with exit codes)
(cherry picked from commit
593a7233e13d6eeb8ae5d894e29c6a27cbc7b7f0)
Change-Id: I6421f95ceb97a596a19781e46cb4767bfb21cdbd
delphinemartin [Mon, 29 Apr 2013 12:04:47 +0000 (14:04 +0200)]
Added support for version 51 class files in dx
If an invokedynamic is present, an exception is thrown.
(cherry picked from commit
94629f2a31206637fc79535ffef1b223e9f02e30)
Change-Id: I1922d4cf78465dfd2ac53f8694b7317a1d98016d
Elliott Hughes [Mon, 13 May 2013 19:07:34 +0000 (12:07 -0700)]
am
f54b2237: am
9275963e: Merge "Move verification of class access flags to libdex"
* commit '
f54b22371370858679ea9908f67b2b06a87ad2f6':
Move verification of class access flags to libdex
Elliott Hughes [Mon, 13 May 2013 19:04:04 +0000 (12:04 -0700)]
am
9275963e: Merge "Move verification of class access flags to libdex"
* commit '
9275963e79d1625120db610b78c3a0812ebb2922':
Move verification of class access flags to libdex
Elliott Hughes [Mon, 13 May 2013 18:50:41 +0000 (18:50 +0000)]
Merge "Move verification of class access flags to libdex"
Brian Carlstrom [Fri, 10 May 2013 14:36:21 +0000 (07:36 -0700)]
am
de33df54: am
130eebad: Merge "Adapt dalvik to new libnativehelper"
* commit '
de33df540b44d21678081c975ef74d4e8a8a7581':
Adapt dalvik to new libnativehelper
Brian Carlstrom [Fri, 10 May 2013 14:34:18 +0000 (07:34 -0700)]
am
130eebad: Merge "Adapt dalvik to new libnativehelper"
* commit '
130eebad44c24874fb940884bfd8d9cde58dc367':
Adapt dalvik to new libnativehelper
Brian Carlstrom [Fri, 10 May 2013 14:17:33 +0000 (14:17 +0000)]
Merge "Adapt dalvik to new libnativehelper"
Brian Carlstrom [Fri, 10 May 2013 02:02:38 +0000 (19:02 -0700)]
Adapt dalvik to new libnativehelper
Change-Id: Id4707ea30c77d3760f1224fd9063c8c3f87c1ea7
Elliott Hughes [Wed, 8 May 2013 22:04:52 +0000 (15:04 -0700)]
am
79d08ba3: am
fd6ac490: Merge "Reject dex files that attempt to use unspecified class access flags"
* commit '
79d08ba33bf5ea639559cd680ac132c1cb81fc3d':
Reject dex files that attempt to use unspecified class access flags
Jamie Gennis [Wed, 8 May 2013 22:03:59 +0000 (15:03 -0700)]
am
cc1f56d4: am
858dfecf: Merge "Add systrace tracing for GC and thread suspension." into jb-mr2-dev
* commit '
cc1f56d4aaba9c4a0c64525b0b48561e65df98df':
Add systrace tracing for GC and thread suspension.
Ben Gruver [Wed, 8 May 2013 20:29:36 +0000 (13:29 -0700)]
Move verification of class access flags to libdex
Change-Id: I020a168cfff46e319b0bebb6c7477f0b4139c6de
Elliott Hughes [Wed, 8 May 2013 20:26:09 +0000 (13:26 -0700)]
am
fd6ac490: Merge "Reject dex files that attempt to use unspecified class access flags"
* commit '
fd6ac49042522cbed5db0c097114a62b5201f6af':
Reject dex files that attempt to use unspecified class access flags
Elliott Hughes [Wed, 8 May 2013 18:33:58 +0000 (18:33 +0000)]
Merge "Reject dex files that attempt to use unspecified class access flags"
The Android Automerger [Wed, 8 May 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jamie Gennis [Wed, 8 May 2013 01:26:50 +0000 (18:26 -0700)]
am
858dfecf: Merge "Add systrace tracing for GC and thread suspension." into jb-mr2-dev
* commit '
858dfecf6db216e3a9ff30b6a38a8e1bf6da6733':
Add systrace tracing for GC and thread suspension.
Jamie Gennis [Wed, 8 May 2013 01:24:29 +0000 (01:24 +0000)]
Merge "Add systrace tracing for GC and thread suspension." into jb-mr2-dev
Jamie Gennis [Tue, 7 May 2013 22:37:01 +0000 (15:37 -0700)]
Add systrace tracing for GC and thread suspension.
Bug:
8856374
Change-Id: I58420a14fb52eab6295381a4d8f2d59eacfe0473
Nick Kralevich [Tue, 7 May 2013 20:56:16 +0000 (20:56 +0000)]
Merge "Don't emit a warning message on missing PR_SET_NO_NEW_PRIVS"
Nick Kralevich [Tue, 7 May 2013 17:38:21 +0000 (10:38 -0700)]
Don't emit a warning message on missing PR_SET_NO_NEW_PRIVS
If the kernel doesn't support PR_SET_NO_NEW_PRIVS, then
don't print a warning message. The warning message only serves
to confuse other people.
This change assumes that, if EINVAL is returned, the kernel is an
old kernel. Newer kernels have no option to disable PR_SET_NO_NEW_PRIVS,
so IMHO, this is a fair assumption.
Change-Id: I77b4769e1d93a9b2412ba5365227283761940fdc