StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS

Browse Source 
So the its target-specific PRIVATE vars can be set properly.

Change-Id: I83b60bd56ee8523b0ba97092010c76c270b60c02
This commit is contained in:
Ying Wang
2010-09-27 14:07:17 -07:00
parent 0235237805
commit 9049e321ae
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java_library.mk
View File

@@ -27,6 +27,9 @@ ifndef LOCAL_IS_HOST_MODULE
ifeq (true,$(WITH_DEXPREOPT)) ifeq (true,$(WITH_DEXPREOPT))
ifndef LOCAL_DEX_PREOPT ifndef LOCAL_DEX_PREOPT
LOCAL_DEX_PREOPT := true LOCAL_DEX_PREOPT := true
jar_with_dex := $(intermediates.COMMON)/javalib.dex.jar
LOCAL_INTERMEDIATE_TARGETS += $(jar_with_dex)
endif endif
endif endif
endif endif
@@ -44,7 +47,6 @@ $(LOCAL_BUILT_MODULE): $(full_classes_jar)
else # !LOCAL_IS_STATIC_JAVA_LIBRARY else # !LOCAL_IS_STATIC_JAVA_LIBRARY
ifeq ($(LOCAL_DEX_PREOPT),true) ifeq ($(LOCAL_DEX_PREOPT),true)
jar_with_dex := $(intermediates.COMMON)/javalib.dex.jar
$(jar_with_dex): PRIVATE_DEX_FILE := $(built_dex) $(jar_with_dex): PRIVATE_DEX_FILE := $(built_dex)
$(jar_with_dex) : $(built_dex) $(java_resource_sources) | $(AAPT) $(jar_with_dex) : $(built_dex) $(java_resource_sources) | $(AAPT)
@echo "target Jar: $(PRIVATE_MODULE) ($@)" @echo "target Jar: $(PRIVATE_MODULE) ($@)"