summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2015-01-20 19:39:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-20 19:39:43 +0000
commit63ae9f33095d8ef38ae938084568b4b9a3acb169 (patch)
tree68d0f0220e7693b6f49761809253004e4c2488ec
parente50c298cc2e616399dc9b20933d383e5343ced30 (diff)
parentf122d90c290c789e0d0085127beebdcf1935c127 (diff)
downloadframeworks_base-63ae9f33095d8ef38ae938084568b4b9a3acb169.zip
frameworks_base-63ae9f33095d8ef38ae938084568b4b9a3acb169.tar.gz
frameworks_base-63ae9f33095d8ef38ae938084568b4b9a3acb169.tar.bz2
Merge "New trick to install bad dex file."
-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