From 9049e321aec53cfb23b63bbee7c21878a087350f Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 27 Sep 2010 14:07:17 -0700 Subject: [PATCH] Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS So the its target-specific PRIVATE vars can be set properly. Change-Id: I83b60bd56ee8523b0ba97092010c76c270b60c02 --- core/java_library.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java_library.mk b/core/java_library.mk index 3e670a94a1..8dd6d4127b 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -27,6 +27,9 @@ ifndef LOCAL_IS_HOST_MODULE ifeq (true,$(WITH_DEXPREOPT)) ifndef LOCAL_DEX_PREOPT LOCAL_DEX_PREOPT := true + +jar_with_dex := $(intermediates.COMMON)/javalib.dex.jar +LOCAL_INTERMEDIATE_TARGETS += $(jar_with_dex) endif endif endif @@ -44,7 +47,6 @@ $(LOCAL_BUILT_MODULE): $(full_classes_jar) else # !LOCAL_IS_STATIC_JAVA_LIBRARY ifeq ($(LOCAL_DEX_PREOPT),true) -jar_with_dex := $(intermediates.COMMON)/javalib.dex.jar $(jar_with_dex): PRIVATE_DEX_FILE := $(built_dex) $(jar_with_dex) : $(built_dex) $(java_resource_sources) | $(AAPT) @echo "target Jar: $(PRIVATE_MODULE) ($@)"