GitLab

* commit '51997559':
  Fail if the new index is out of range. do not merge.

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

(cherry picked from commit 0a752f07)

Change-Id: I6adbe6309bdcb2882f0e5500d6e1e149d08dbd2d

am b6f4e037: am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."

* commit 'b6f4e037':
  Revert "Fix alignment when recompacting a DexMerger result. do not merge."

am 437f58a5: am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.

* commit '437f58a5':
  Fix alignment when recompacting a DexMerger result. do not merge.

am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."

* commit 'afe3a013':
  Revert "Fix alignment when recompacting a DexMerger result. do not merge."

am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.

* commit '2d2f13c5':
  Fix alignment when recompacting a DexMerger result. do not merge.

Change-Id: Ic0fb72b0939908c2e072e4ae5d60c9d24de9dc66

Change-Id: Ib8ea0f0d579f78fcab1deca05ff1beac9ba9bc03

This allows large dex files with many strings to be merged properly.

(cherry picked from commit 266f45ff)

Change-Id: I5fe4c55d84a91101a4f89f590117aa6dc0bfc0f2

* commit '288f2280':
  Revert "Fix alignment when recompacting a DexMerger result. do not merge."

This reverts commit 707ebe9f

Looks like jb-dev is missing some other patches before it possible to cherry-pick this one.

Change-Id: I8cbdd649d03696cb80be0dacc8640275468ef162

* commit '707ebe9f':
  Fix alignment when recompacting a DexMerger result. do not merge.

(cherry picked from commit e0e7b076e427a327e27247aa409d0b0fa8b0e0aa)

Change-Id: Ib8092bd9ce9ba5490040a41c5d604e6a138acc7d

Change-Id: Ia24bfd680910be16fa6f89fbd48db251b076d8f6

am a0475a59: (-s ours) am d5cc3680: (-s ours) am 9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.

* commit 'a0475a59':
  Add dx option to always generate const-string/jumbo. do not merge.

* commit '69dd411c':
  Add dx option to always generate const-string/jumbo. do not merge.

am d5cc3680: (-s ours) am 9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.

* commit 'd5cc3680':
  Add dx option to always generate const-string/jumbo. do not merge.

* commit '9db54b1e':
  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 266f45ff)

Change-Id: I0277b1a0a81b3a77092a9e9f8f648ff190e29723

This allows large dex files with many strings to be merged properly.

(cherry picked from commit 266f45ff)

Change-Id: I5e85346610c4c5280ecdd9e97c63eaef4420642e

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

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

This reverts commit 0fe88520

May be causing http://b/7343420, though I can't reproduce that crash.

Change-Id: Ia3d2a1507602d07699d1f9914e734cc813f97518

Still warn, and enforce the missing check for targetSdkVersion >= 17.

Bug: 7301030
Change-Id: I8189fcbf222f331b1f80a156b01082d61f1f9362

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 4b3f78e7.)

Bug: 7179010
Change-Id: I627badb448a056ed4a1cc1e75a05325ce6112876

Always prepare legacy path, since it's no longer created by init.

Bug: 7255202
Change-Id: I152b44ac62f69923b300abc8d394afe79dac4601

It turns out that some apps swallow the UnsatisfiedLinkError, making it
really hard to work out why they failed to launch.

Before:
  D dalvikvm: Trying to load lib /data/app-lib/com.adobe.air-1/libCore.so 0x415be8a8
  W dalvikvm: No implementation found for native Lcom/adobe/air/AIRWindowSurfaceView;.nativeSurfaceCreated:()V

After:
  D dalvikvm: Trying to load lib /data/app-lib/com.adobe.air-1/libCore.so 0x415be8a8
  E dalvikvm: dlopen("/data/app-lib/com.adobe.air-1/libCore.so") failed: Cannot load library: soinfo_relocate(linker.cpp:975): cannot locate symbol "_ZN7android10VectorImpl19reservedVectorImpl1Ev" referenced by "libCore.so"...
  W dalvikvm: No implementation found for native Lcom/adobe/air/AIRWindowSurfaceView;.nativeSurfaceCreated:()V

Bug: 7093208
Change-Id: Ib751fb959d49cb872d586f299e62ed6aae783de9