summaryrefslogtreecommitdiffstats
path: root/core/tests
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2015-01-20 21:43:51 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-20 21:43:52 +0000
commite4a031e3c3b234ff91ce62e95b788eca7e00082c (patch)
tree8ab36b0637f6fba26c0c32e832f9bbe36ddefec9 /core/tests
parent42c2ac00e6e6e8fcfd15dcfbc6d70eabc709d904 (diff)
parentb643624d2f01145f200dfe15b6b7627241deee29 (diff)
downloadframeworks_base-e4a031e3c3b234ff91ce62e95b788eca7e00082c.zip
frameworks_base-e4a031e3c3b234ff91ce62e95b788eca7e00082c.tar.gz
frameworks_base-e4a031e3c3b234ff91ce62e95b788eca7e00082c.tar.bz2
Merge "New trick to install bad dex file."
Diffstat (limited to 'core/tests')
-rw-r--r--core/tests/coretests/apks/install_bad_dex/Android.mk5
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