OSDN Git Service
Elliott Hughes [Wed, 7 Nov 2012 04:33:51 +0000 (20:33 -0800)]
resolved conflicts for merge of
57a76b06 to master
Change-Id: If29e5cb05954bf55a24475c249558a8d5a1c391f
Elliott Hughes [Wed, 7 Nov 2012 01:39:48 +0000 (17:39 -0800)]
am
11ef8f2b: am
9a8b82ae: Merge "Always build WITH_JIT for the target."
* commit '
11ef8f2b8b74b1f0556e0e55f76e4984189c0803':
Always build WITH_JIT for the target.
Elliott Hughes [Wed, 7 Nov 2012 01:37:44 +0000 (17:37 -0800)]
am
9a8b82ae: Merge "Always build WITH_JIT for the target."
* commit '
9a8b82ae06ef2e0fbd6b0a342a2394a6830afd95':
Always build WITH_JIT for the target.
Elliott Hughes [Wed, 7 Nov 2012 01:17:32 +0000 (17:17 -0800)]
Merge "Always build WITH_JIT for the target."
Elliott Hughes [Wed, 7 Nov 2012 00:34:28 +0000 (16:34 -0800)]
Always build WITH_JIT for the target.
Without this, by default MIPS and x86 builds build without a JIT.
Change-Id: Ieff5c25fd4e40401ed511e952a4f189615131327
The Android Open Source Project [Tue, 6 Nov 2012 19:28:31 +0000 (11:28 -0800)]
am
44291d2f: (-s ours) am
6fbc2f19: am
e7e77c4b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
44291d2f2cdde221312249161d4e61c54c19225f':
The Android Open Source Project [Tue, 6 Nov 2012 19:26:04 +0000 (11:26 -0800)]
am
6fbc2f19: am
e7e77c4b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
6fbc2f19af5adee4b423a203fe2e00c5afb5803f':
The Android Open Source Project [Tue, 6 Nov 2012 19:22:55 +0000 (11:22 -0800)]
am
e7e77c4b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
e7e77c4bd64c87798344d690e13418b481ab2d05':
Revert the fix for incorrect package-private overriding.
One more errno for encrypted devices.
Revert "Upgrade to dlmalloc 2.8.5."
Revert "Ensure we fence the writing of clazz to an Object post allocation."
The Android Open Source Project [Tue, 6 Nov 2012 19:20:15 +0000 (11:20 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ia24bfd680910be16fa6f89fbd48db251b076d8f6
The Android Open Source Project [Wed, 31 Oct 2012 16:19:20 +0000 (09:19 -0700)]
am
73032be2: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
73032be2fe9305281bd8a68a3030bef922f1f972':
Revert the fix for incorrect package-private overriding.
The Android Open Source Project [Wed, 31 Oct 2012 16:15:35 +0000 (09:15 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Idcb8619166f794d334655aaf35232bb6a09e1c9e
Elliott Hughes [Tue, 30 Oct 2012 17:11:45 +0000 (10:11 -0700)]
am
ade14ce4: am
2988c4f2: Merge "Fix dalvik\'s use of readdir_r(3)."
* commit '
ade14ce41d3e22802c77c18c35ca3e41867f1049':
Fix dalvik's use of readdir_r(3).
Elliott Hughes [Tue, 30 Oct 2012 00:14:58 +0000 (17:14 -0700)]
am
2988c4f2: Merge "Fix dalvik\'s use of readdir_r(3)."
* commit '
2988c4f272f62af2e96f1e6161d4e99bc1dc1b16':
Fix dalvik's use of readdir_r(3).
jeffhao [Mon, 29 Oct 2012 20:55:10 +0000 (13:55 -0700)]
am
4dfbbd23: (-s ours) am
f6650edf: am
d454d96b: am
a0475a59: (-s ours) am
d5cc3680: (-s ours) am
9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
4dfbbd231168876d6f26b90dca5a09d36aa437fc':
jeffhao [Mon, 29 Oct 2012 20:55:07 +0000 (13:55 -0700)]
am
0b0d7194: (-s ours) am
3daa7a27: am
07df9514: am
69dd411c: (-s ours) Add dx option to always generate const-string/jumbo. do not merge.
* commit '
0b0d71940314e9725de29a995062ccff4fa0887d':
jeffhao [Mon, 29 Oct 2012 20:52:18 +0000 (13:52 -0700)]
am
f6650edf: am
d454d96b: am
a0475a59: (-s ours) am
d5cc3680: (-s ours) am
9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
f6650edf4225b489e39bf560fed406c749ee0c5b':
jeffhao [Mon, 29 Oct 2012 20:52:17 +0000 (13:52 -0700)]
am
3daa7a27: am
07df9514: am
69dd411c: (-s ours) Add dx option to always generate const-string/jumbo. do not merge.
* commit '
3daa7a27d4320c799a4ee8f04dc1e6dfa733734f':
jeffhao [Mon, 29 Oct 2012 20:42:09 +0000 (13:42 -0700)]
am
d454d96b: am
a0475a59: (-s ours) am
d5cc3680: (-s ours) am
9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
d454d96bf19438d2fc4301714abf55f7fecd0001':
jeffhao [Mon, 29 Oct 2012 20:42:08 +0000 (13:42 -0700)]
am
07df9514: am
69dd411c: (-s ours) Add dx option to always generate const-string/jumbo. do not merge.
* commit '
07df951456410a66353455108d86958985a15115':
Elliott Hughes [Fri, 26 Oct 2012 23:45:29 +0000 (16:45 -0700)]
Merge "Fix dalvik's use of readdir_r(3)."
The Android Automerger [Fri, 26 Oct 2012 23:22:35 +0000 (16:22 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Fri, 26 Oct 2012 22:27:20 +0000 (15:27 -0700)]
Fix dalvik's use of readdir_r(3).
Change-Id: Ic2c9b88b2b3204b4c02f4838766dc4d9ebad06a2
Nick Kralevich [Fri, 19 Oct 2012 22:08:26 +0000 (15:08 -0700)]
am
7c3fb240: resolved conflicts for merge of
e206e7c9 to jb-mr1-dev-plus-aosp
* commit '
7c3fb24095a3f6cf2ca6e25ddb4af24933ff3e4d':
Push to AOSP
Nick Kralevich [Fri, 19 Oct 2012 22:00:49 +0000 (15:00 -0700)]
resolved conflicts for merge of
e206e7c9 to jb-mr1-dev-plus-aosp
Change-Id: I52fcfbdeb6bbb39c5330ce2be589ec546805aa1f
Nick Kralevich [Fri, 19 Oct 2012 21:38:11 +0000 (14:38 -0700)]
Merge "Push to AOSP"
Nick Kralevich [Fri, 19 Oct 2012 20:45:06 +0000 (13:45 -0700)]
Nick Kralevich [Fri, 19 Oct 2012 19:59:28 +0000 (12:59 -0700)]
Revise previous patch based on feedback.
Change-Id: Ica39399d35c961e13cf401784ce024b6f85fe00a
Nick Kralevich [Fri, 19 Oct 2012 19:15:52 +0000 (12:15 -0700)]
Zygote: don't inhibit randomization on non-arm platforms
Change-Id: I5fd4887612cb0c38f9736c3289056e99970a8ae4
jeffhao [Wed, 17 Oct 2012 18:10:42 +0000 (11:10 -0700)]
am
a0475a59: (-s ours) am
d5cc3680: (-s ours) am
9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
a0475a59b58c39c9a3babddc371815c6d51e3f39':
Add dx option to always generate const-string/jumbo. do not merge.
jeffhao [Wed, 17 Oct 2012 18:08:33 +0000 (11:08 -0700)]
am
69dd411c: (-s ours) Add dx option to always generate const-string/jumbo. do not merge.
* commit '
69dd411c7ef47e3ea3f6ff8be9a4d903f545f0d5':
Add dx option to always generate const-string/jumbo. do not merge.
jeffhao [Wed, 17 Oct 2012 18:01:19 +0000 (11:01 -0700)]
am
a753f156: (-s ours) am
13b52dd6: am
a0475a59: am
d5cc3680: (-s ours) am
9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
a753f156cbdf410f8b1ea9605d98f8eddf963ee6':
Add dx option to always generate const-string/jumbo. do not merge.
jeffhao [Wed, 17 Oct 2012 17:59:15 +0000 (10:59 -0700)]
am
13b52dd6: am
a0475a59: am
d5cc3680: (-s ours) am
9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
13b52dd62109b7ce81eb284e159c02cefbf820a3':
Add dx option to always generate const-string/jumbo. do not merge.
jeffhao [Wed, 17 Oct 2012 17:56:37 +0000 (10:56 -0700)]
am
a0475a59: am
d5cc3680: (-s ours) am
9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
a0475a59b58c39c9a3babddc371815c6d51e3f39':
Add dx option to always generate const-string/jumbo. do not merge.
jeffhao [Wed, 17 Oct 2012 17:53:43 +0000 (10:53 -0700)]
am
d5cc3680: (-s ours) am
9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
d5cc36801bb86ba4e8b3db6efc67282f41b5b784':
Add dx option to always generate const-string/jumbo. do not merge.
jeffhao [Wed, 17 Oct 2012 17:50:43 +0000 (10:50 -0700)]
am
9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
9db54b1e21b8e994658890328e57caa822e444a7':
Add dx option to always generate const-string/jumbo. do not merge.
Kenny Root [Wed, 17 Oct 2012 16:58:13 +0000 (09:58 -0700)]
am
119d6541: resolved conflicts for merge of
ab84215a to jb-mr1-dev-plus-aosp
* commit '
119d65419fd54b7f150bb0eacc7d0b540e8ba1d7':
Remove HAVE_SELINUX guards
Kenny Root [Wed, 17 Oct 2012 16:46:36 +0000 (09:46 -0700)]
resolved conflicts for merge of
ab84215a to jb-mr1-dev-plus-aosp
Change-Id: I0420c747fbe23b24e6ba2a5865587fe732eff387
Kenny Root [Wed, 17 Oct 2012 16:35:52 +0000 (09:35 -0700)]
Merge "Remove HAVE_SELINUX guards"
Kenny Root [Wed, 17 Oct 2012 06:38:15 +0000 (23:38 -0700)]
Remove HAVE_SELINUX guards
Change-Id: I1cb99cd25857a70049220d4368f21d97c3b80ebf
The Android Automerger [Wed, 17 Oct 2012 13:59:13 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
jeffhao [Wed, 17 Oct 2012 02:00:24 +0000 (19:00 -0700)]
am
4cccdc28: (-s ours) am
3b53278d: am
69dd411c: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
4cccdc28adf4ba4f09832346584c060ae2737890':
Add dx option to always generate const-string/jumbo. do not merge.
jeffhao [Wed, 17 Oct 2012 01:57:28 +0000 (18:57 -0700)]
am
3b53278d: am
69dd411c: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
3b53278d274cbf4398917ee76f024cbb71ea28f6':
Add dx option to always generate const-string/jumbo. do not merge.
jeffhao [Wed, 17 Oct 2012 01:54:58 +0000 (18:54 -0700)]
am
69dd411c: Add dx option to always generate const-string/jumbo. do not merge.
* commit '
69dd411c7ef47e3ea3f6ff8be9a4d903f545f0d5':
Add dx option to always generate const-string/jumbo. do not merge.
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: I0277b1a0a81b3a77092a9e9f8f648ff190e29723
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: I5e85346610c4c5280ecdd9e97c63eaef4420642e
The Android Automerger [Tue, 16 Oct 2012 13:59:12 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Tue, 16 Oct 2012 03:25:55 +0000 (20:25 -0700)]
am
8f44c808: am
cda473c1: Merge "Handle MAX_INT case in packed-switch"
* commit '
8f44c80882907af84e76b8fe87e4601f8c0341d8':
Handle MAX_INT case in packed-switch
Elliott Hughes [Tue, 16 Oct 2012 03:25:54 +0000 (20:25 -0700)]
am
d7233190: am
20b6e422: Merge "Remove Jumbo opcode support"
* commit '
d72331907d6c328512e969ba68dac1ea72beee41':
Remove Jumbo opcode support
Elliott Hughes [Tue, 16 Oct 2012 03:20:52 +0000 (20:20 -0700)]
am
cda473c1: Merge "Handle MAX_INT case in packed-switch"
* commit '
cda473c171f967db7472d1832cd4cf2111665264':
Handle MAX_INT case in packed-switch
Elliott Hughes [Tue, 16 Oct 2012 03:20:51 +0000 (20:20 -0700)]
am
20b6e422: Merge "Remove Jumbo opcode support"
* commit '
20b6e422412a2d004e3a92e5bfbba77d3de5e6c3':
Remove Jumbo opcode support
jeffhao [Tue, 16 Oct 2012 01:31:38 +0000 (18:31 -0700)]
Merge "Add dx option to always generate const-string/jumbo."
Elliott Hughes [Tue, 16 Oct 2012 01:07:08 +0000 (18:07 -0700)]
Merge "Handle MAX_INT case in packed-switch"
Chris Dearman [Thu, 12 Jul 2012 00:10:36 +0000 (17:10 -0700)]
Handle MAX_INT case in packed-switch
Allows regression 095-switch-MAX_INT to pass
Change-Id: Iec97fb456d43dbb14ee096fe708c74aff5ba1f5a
Signed-off-by: Chris Dearman <chris@mips.com>
jeffhao [Tue, 16 Oct 2012 00:04:46 +0000 (17:04 -0700)]
Add dx option to always generate const-string/jumbo.
This allows large dex files with many strings to be merged properly.
Change-Id: I2c32b03ddb42735d16bc6155c1a1096159fb15ed
Elliott Hughes [Tue, 16 Oct 2012 00:36:47 +0000 (17:36 -0700)]
Merge "Remove Jumbo opcode support"
Elliott Hughes [Mon, 15 Oct 2012 21:29:23 +0000 (14:29 -0700)]
Revert the fix for incorrect package-private overriding.
This fixes FIFA 2012, the download portion of which relies on the
old bug, without breaking instrumentation tests. The problem is that
dexopt tries to quicken method calls, and gets confused by this case
where the apparent static method resolution differs from the actual
one at runtime, depending on the targetSdkVersion of the specific app.
dexopt can't make an ahead-of-time decision in a world where the rules
might change at runtime.
Bug:
7301030
Bug:
7343420
Change-Id: Iaa15611f099546b7e54279cfd6abc9b4cdcb9812
Elliott Hughes [Mon, 15 Oct 2012 22:58:41 +0000 (15:58 -0700)]
am
48aa13d7: am
0a2bb853: am
97358651: Revert the fix for incorrect package-private overriding.
* commit '
48aa13d722b0c9831fe01fb4d25e96eab3043498':
Revert the fix for incorrect package-private overriding.
Elliott Hughes [Mon, 15 Oct 2012 22:55:52 +0000 (15:55 -0700)]
am
0a2bb853: am
97358651: Revert the fix for incorrect package-private overriding.
* commit '
0a2bb8537b3dbb4ef7ff03b64499ec6a14cdaf46':
Revert the fix for incorrect package-private overriding.
Elliott Hughes [Mon, 15 Oct 2012 22:52:55 +0000 (15:52 -0700)]
am
97358651: Revert the fix for incorrect package-private overriding.
* commit '
9735865121118f255c4c15183b236f9f30e795f1':
Revert the fix for incorrect package-private overriding.
Raghu Gandham [Mon, 15 Oct 2012 22:29:11 +0000 (15:29 -0700)]
Remove Jumbo opcode support
Change-Id: If112b0f44cb6ea064fe8038f10bb00a0cf11c124
Elliott Hughes [Mon, 15 Oct 2012 21:29:23 +0000 (14:29 -0700)]
Revert the fix for incorrect package-private overriding.
This fixes FIFA 2012, the download portion of which relies on the
old bug, without breaking instrumentation tests. The problem is that
dexopt tries to quicken method calls, and gets confused by this case
where the apparent static method resolution differs from the actual
one at runtime, depending on the targetSdkVersion of the specific app.
dexopt can't make an ahead-of-time decision in a world where the rules
might change at runtime.
Bug:
7301030
Bug:
7343420
Change-Id: Iaa15611f099546b7e54279cfd6abc9b4cdcb9812
The Android Automerger [Mon, 15 Oct 2012 19:30:39 +0000 (12:30 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Open Source Project [Mon, 15 Oct 2012 14:40:22 +0000 (07:40 -0700)]
am
34b45f88: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
34b45f88a3eedd23a1b369138c8e376edb6f8168':
The Android Open Source Project [Mon, 15 Oct 2012 14:37:59 +0000 (07:37 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Id403e6fb16b6b14191481f00bf0166913a54ba35
The Android Automerger [Sat, 13 Oct 2012 10:49:58 +0000 (03:49 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Sat, 13 Oct 2012 00:56:19 +0000 (17:56 -0700)]
am
ae81ca40: am
e3c42563: am
ed94ff79: Revert "Don\'t enforce access checks for overloading for targetSdkVersion < 17."
* commit '
ae81ca4088e5b2b696820828f9e785ca55dc1d8e':
Revert "Don't enforce access checks for overloading for targetSdkVersion < 17."
Elliott Hughes [Sat, 13 Oct 2012 00:55:04 +0000 (17:55 -0700)]
am
e3c42563: am
ed94ff79: Revert "Don\'t enforce access checks for overloading for targetSdkVersion < 17."
* commit '
e3c425633daeb0e3cba9b040ccc2805bea3c4a8b':
Revert "Don't enforce access checks for overloading for targetSdkVersion < 17."
Elliott Hughes [Sat, 13 Oct 2012 00:53:25 +0000 (17:53 -0700)]
am
ed94ff79: Revert "Don\'t enforce access checks for overloading for targetSdkVersion < 17."
* commit '
ed94ff793680873d2c942641ccda9ea81c95b5ad':
Revert "Don't enforce access checks for overloading for targetSdkVersion < 17."
Elliott Hughes [Sat, 13 Oct 2012 00:47:06 +0000 (17:47 -0700)]
Revert "Don't enforce access checks for overloading for targetSdkVersion < 17."
This reverts commit
0fe885202fc2d1e7f3d34c99ae3487a9a6387be1
May be causing http://b/
7343420, though I can't reproduce that crash.
Change-Id: Ia3d2a1507602d07699d1f9914e734cc813f97518
The Android Automerger [Fri, 12 Oct 2012 23:34:27 +0000 (16:34 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Elliott Hughes [Fri, 12 Oct 2012 18:51:57 +0000 (11:51 -0700)]
am
248f40a6: am
0e81b3ef: Merge "Remove (one last?) __sh__."
* commit '
248f40a691f7b55baffe4c1f0be060765991936b':
Remove (one last?) __sh__.
Elliott Hughes [Fri, 12 Oct 2012 18:50:16 +0000 (11:50 -0700)]
am
0e81b3ef: Merge "Remove (one last?) __sh__."
* commit '
0e81b3eff8c7654c489011ffd9fa31ab4fed0f44':
Remove (one last?) __sh__.
The Android Automerger [Fri, 12 Oct 2012 18:49:48 +0000 (11:49 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Fri, 12 Oct 2012 18:43:53 +0000 (11:43 -0700)]
Merge "Remove (one last?) __sh__."
Elliott Hughes [Fri, 12 Oct 2012 18:17:34 +0000 (11:17 -0700)]
am
bca7721c: am
f1780867: am
0fe88520: Don\'t enforce access checks for overloading for targetSdkVersion < 17.
* commit '
bca7721c678858af6007939cfd061a9af2d3cf42':
Don't enforce access checks for overloading for targetSdkVersion < 17.
Elliott Hughes [Fri, 12 Oct 2012 18:13:19 +0000 (11:13 -0700)]
Remove (one last?) __sh__.
Zombies everywhere! I think this is the last one that isn't in third-party
code, though I'm pretty sure I've said that before.
Change-Id: I07c88a07c694eea646bee85c5e9ad3004b3a03e1
Elliott Hughes [Fri, 12 Oct 2012 18:10:31 +0000 (11:10 -0700)]
am
f1780867: am
0fe88520: Don\'t enforce access checks for overloading for targetSdkVersion < 17.
* commit '
f17808671a905e184d600f80a0657bf2640b14ab':
Don't enforce access checks for overloading for targetSdkVersion < 17.
Elliott Hughes [Fri, 12 Oct 2012 17:30:03 +0000 (10:30 -0700)]
am
0fe88520: Don\'t enforce access checks for overloading for targetSdkVersion < 17.
* commit '
0fe885202fc2d1e7f3d34c99ae3487a9a6387be1':
Don't enforce access checks for overloading for targetSdkVersion < 17.
Elliott Hughes [Fri, 12 Oct 2012 01:17:50 +0000 (18:17 -0700)]
Don't enforce access checks for overloading for targetSdkVersion < 17.
Still warn, and enforce the missing check for targetSdkVersion >= 17.
Bug:
7301030
Change-Id: I8189fcbf222f331b1f80a156b01082d61f1f9362
The Android Open Source Project [Wed, 10 Oct 2012 16:45:46 +0000 (09:45 -0700)]
am
6bfe5155: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
6bfe51550a6d31fa12bbfcf29190151457b901ba':
The Android Open Source Project [Wed, 10 Oct 2012 16:43:58 +0000 (09:43 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ibd02b2d1bdb7511eb777e72afd2d62b7327dca96
The Android Automerger [Wed, 10 Oct 2012 15:43:19 +0000 (08:43 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:12 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Wed, 10 Oct 2012 02:37:16 +0000 (19:37 -0700)]
am
0e12aa4f: am
29c00997: am
9c789541: Don\'t disable inlining for ARM.
* commit '
0e12aa4f236780795b03c737114c338237c0a83a':
Don't disable inlining for ARM.
Elliott Hughes [Wed, 10 Oct 2012 02:35:08 +0000 (19:35 -0700)]
am
29c00997: am
9c789541: Don\'t disable inlining for ARM.
* commit '
29c00997c5ac9becbebb0337affe9e5b5ef27da1':
Don't disable inlining for ARM.
Elliott Hughes [Wed, 10 Oct 2012 02:33:19 +0000 (19:33 -0700)]
am
7519654e: am
0138866d: Merge "Don\'t disable inlining for ARM."
* commit '
7519654e8bdfd1a19c1a60be175f49d141ed1770':
Don't disable inlining for ARM.
Elliott Hughes [Wed, 10 Oct 2012 02:32:53 +0000 (19:32 -0700)]
am
9c789541: Don\'t disable inlining for ARM.
* commit '
9c789541c5a37dc8c5d12d98b8db74def61e26db':
Don't disable inlining for ARM.
Elliott Hughes [Wed, 10 Oct 2012 02:31:40 +0000 (19:31 -0700)]
am
0138866d: Merge "Don\'t disable inlining for ARM."
* commit '
0138866d22a58269602a45adf30d69ec55910b43':
Don't disable inlining for ARM.
Elliott Hughes [Wed, 10 Oct 2012 02:20:03 +0000 (19:20 -0700)]
Merge "Don't disable inlining for ARM."
Elliott Hughes [Wed, 10 Oct 2012 01:07:14 +0000 (18:07 -0700)]
Don't disable inlining for ARM.
I think there was confusion here between method inlining and the method
compiler. Just because the latter isn't yet functional doesn't mean we
don't want the former for those targets that support it.
(cherry-pick of
4b3f78e73109604b817294a9c21bc3653328e3fb.)
Bug:
7179010
Change-Id: I627badb448a056ed4a1cc1e75a05325ce6112876
Elliott Hughes [Wed, 10 Oct 2012 01:07:14 +0000 (18:07 -0700)]
Don't disable inlining for ARM.
I think there was confusion here between method inlining and the method
compiler. Just because the latter isn't yet functional doesn't mean we
don't want the former for those targets that support it.
Bug:
7179010
Change-Id: If0de856b93615f01dfc5e8977d5c97f550cec15f
The Android Open Source Project [Tue, 9 Oct 2012 14:31:41 +0000 (07:31 -0700)]
am
3b43dbce: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
3b43dbce7c80b7b72bb3851cda955af9627d054f':
The Android Open Source Project [Tue, 9 Oct 2012 14:28:18 +0000 (07:28 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ied76c774dce525f9e1ed5c59be92c7cd5bbd9059
The Android Automerger [Tue, 9 Oct 2012 13:59:11 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Mon, 8 Oct 2012 19:17:16 +0000 (12:17 -0700)]
am
e807903b: am
525d731d: am
43e44fd5: Merge "Log if dlopen(3) fails." into jb-mr1-dev
* commit '
e807903b6e05ecfe1418e8694caef076e7136f8a':
Log if dlopen(3) fails.
Elliott Hughes [Mon, 8 Oct 2012 19:15:41 +0000 (12:15 -0700)]
am
525d731d: am
43e44fd5: Merge "Log if dlopen(3) fails." into jb-mr1-dev
* commit '
525d731dcc2d4629681fbc6f8e37f2e3bda4a6ac':
Log if dlopen(3) fails.
Elliott Hughes [Mon, 8 Oct 2012 19:14:19 +0000 (12:14 -0700)]
am
43e44fd5: Merge "Log if dlopen(3) fails." into jb-mr1-dev
* commit '
43e44fd5952d0bbad335c54d1f5c3eac920d755b':
Log if dlopen(3) fails.
Elliott Hughes [Mon, 8 Oct 2012 19:12:13 +0000 (12:12 -0700)]
Merge "Log if dlopen(3) fails." into jb-mr1-dev
Elliott Hughes [Sat, 6 Oct 2012 01:14:39 +0000 (18:14 -0700)]
am
70799856: am
37268179: am
0dc107c0: Merge "MIPS: Missing zero-checks in JIT compiler."
* commit '
707998566a9814fb2dbb892874711a708915f213':
MIPS: Missing zero-checks in JIT compiler.
Elliott Hughes [Sat, 6 Oct 2012 01:12:32 +0000 (18:12 -0700)]
am
37268179: am
0dc107c0: Merge "MIPS: Missing zero-checks in JIT compiler."
* commit '
3726817959d2bd8bea87726338c05464f7f29e3b':
MIPS: Missing zero-checks in JIT compiler.