diff options
| author | Ying Wang <wangying@google.com> | 2015-01-20 21:50:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-20 21:50:14 +0000 |
| commit | b51089499c8c39fce47deccf70d3ea069c58b471 (patch) | |
| tree | 8ab36b0637f6fba26c0c32e832f9bbe36ddefec9 | |
| parent | aa3a45ba5bc78ab4015a1d2c4c361d3f54118d8e (diff) | |
| parent | e4a031e3c3b234ff91ce62e95b788eca7e00082c (diff) | |
| download | frameworks_base-b51089499c8c39fce47deccf70d3ea069c58b471.zip frameworks_base-b51089499c8c39fce47deccf70d3ea069c58b471.tar.gz frameworks_base-b51089499c8c39fce47deccf70d3ea069c58b471.tar.bz2 | |
am e4a031e3: Merge "New trick to install bad dex file."
* commit 'e4a031e3c3b234ff91ce62e95b788eca7e00082c':
New trick to install bad dex file.
| -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 |