From b643624d2f01145f200dfe15b6b7627241deee29 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Wed, 14 Jan 2015 16:18:51 -0800 Subject: [PATCH] New trick to install bad dex file. Previously we use LOCAL_JAVA_RESOURCE_FILES to override the normally generated classes.dex with a bad dex file. Now as we have moved Java resource processing before running jarjar, dx would fail for the bad classes.dex inside the classes.jar. Instead we override the target specific variable PRIVATE_DEX_FILE to inject the bad dex file. (cherry-picked from commit f122d90c290c789e0d0085127beebdcf1935c127) Bug: 18837479 Change-Id: I73f82c8a15e1d8935d9c2f290ba9456184a56ec7 --- core/tests/coretests/apks/install_bad_dex/Android.mk | 5 +++-- 1 file 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 769a1b0a7cab7..05983aa6ec7be 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