diff options
author | Ying Wang <wangying@google.com> | 2015-01-20 22:01:26 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-20 22:01:26 +0000 |
commit | 43df3c6c198da1c2a6622e50fca86b656385baf1 (patch) | |
tree | 17e5fc5f99075aba40f6b1194ac3e4d804e794ba /core/tests | |
parent | d9bd08864eaf9d8847d974eadb81806b9e086a2d (diff) | |
parent | b51089499c8c39fce47deccf70d3ea069c58b471 (diff) | |
download | frameworks_base-43df3c6c198da1c2a6622e50fca86b656385baf1.zip frameworks_base-43df3c6c198da1c2a6622e50fca86b656385baf1.tar.gz frameworks_base-43df3c6c198da1c2a6622e50fca86b656385baf1.tar.bz2 |
am b5108949: am e4a031e3: Merge "New trick to install bad dex file."
* commit 'b51089499c8c39fce47deccf70d3ea069c58b471':
New trick to install bad dex file.
Diffstat (limited to 'core/tests')
-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 |