Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9049e321 authored by Ying Wang's avatar Ying Wang
Browse files

Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS 

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

Change-Id: I83b60bd56ee8523b0ba97092010c76c270b60c02
parent 02352378

core/java_library.mk

+3 −1
Original line number Diff line number Diff line
@@ -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) ($@)"