Merge "Don't depend on classes-header.jar when turbine is disabled"
am: e8f1a420bc
Change-Id: Ie90ccc32537299a4f61ca6dbf1e1c55e4a14e210
This commit is contained in:
@@ -95,7 +95,10 @@ ifdef LOCAL_SOONG_DEX_JAR
|
|||||||
|
|
||||||
$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
|
$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
|
||||||
$(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(common_javalib.jar)))
|
$(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(common_javalib.jar)))
|
||||||
$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar)))
|
$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar)))
|
||||||
|
ifneq ($(TURBINE_ENABLED),false)
|
||||||
|
$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_header_jar)))
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
java-dex : $(LOCAL_BUILT_MODULE)
|
java-dex : $(LOCAL_BUILT_MODULE)
|
||||||
|
Reference in New Issue
Block a user