diff options
| author | Ying Wang <wangying@google.com> | 2015-01-14 16:18:51 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-01-20 12:15:17 -0800 |
| commit | b643624d2f01145f200dfe15b6b7627241deee29 (patch) | |
| tree | 8ab36b0637f6fba26c0c32e832f9bbe36ddefec9 /core/tests/coretests/apks | |
| parent | 42c2ac00e6e6e8fcfd15dcfbc6d70eabc709d904 (diff) | |
| download | frameworks_base-b643624d2f01145f200dfe15b6b7627241deee29.zip frameworks_base-b643624d2f01145f200dfe15b6b7627241deee29.tar.gz frameworks_base-b643624d2f01145f200dfe15b6b7627241deee29.tar.bz2 | |
New trick to install bad dex file.
Previously we use LOCAL_JAVA_RESOURCE_FILES to override the normally
generated classes.dex with a bad dex file.
Now as we have moved Java resource processing before running jarjar, dx
would fail for the bad classes.dex inside the classes.jar.
Instead we override the target specific variable PRIVATE_DEX_FILE to
inject the bad dex file.
(cherry-picked from commit f122d90c290c789e0d0085127beebdcf1935c127)
Bug: 18837479
Change-Id: I73f82c8a15e1d8935d9c2f290ba9456184a56ec7
Diffstat (limited to 'core/tests/coretests/apks')
| -rw-r--r-- | core/tests/coretests/apks/install_bad_dex/Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/tests/coretests/apks/install_bad_dex/Android.mk b/core/tests/coretests/apks/install_bad_dex/Android.mk index 769a1b0..05983aa 100644 --- a/core/tests/coretests/apks/install_bad_dex/Android.mk +++ b/core/tests/coretests/apks/install_bad_dex/Android.mk @@ -5,6 +5,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := install_bad_dex -LOCAL_JAVA_RESOURCE_FILES := $(LOCAL_PATH)/classes.dex - include $(FrameworkCoreTests_BUILD_PACKAGE) + +# Override target specific variable PRIVATE_DEX_FILE to inject bad classes.dex file. +$(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(LOCAL_PATH)/classes.dex |