commit 9049e321aec53cfb23b63bbee7c21878a087350f
author Ying Wang <wangying@google.com> Mon Sep 27 14:07:17 2010 -0700
committer Ying Wang <wangying@google.com> Mon Sep 27 14:07:17 2010 -0700
tree fd294987a13abeab404ed0b831c3e9e648d0888b
parent 0235237805991b48831dc8add072a50c478b2fcb

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

diff --git a/core/java_library.mk b/core/java_library.mk
index 3e670a9..8dd6d41 100644
--- a/core/java_library.mk
+++ b/core/java_library.mk
@@ -27,6 +27,9 @@
 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 @@
 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) ($@)"