commit e4a031e3c3b234ff91ce62e95b788eca7e00082c
author Ying Wang <wangying@google.com> Tue Jan 20 21:43:51 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 20 21:43:52 2015 +0000
tree 8ab36b0637f6fba26c0c32e832f9bbe36ddefec9
parent 42c2ac00e6e6e8fcfd15dcfbc6d70eabc709d904
parent b643624d2f01145f200dfe15b6b7627241deee29

Merge "New trick to install bad dex file."

core/tests/coretests/apks/install_bad_dex/Android.mk

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_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