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

Merge "Don't depend on classes-header.jar when turbine is disabled"

Browse Source 
am: e8f1a420bc

Change-Id: Ie90ccc32537299a4f61ca6dbf1e1c55e4a14e210
This commit is contained in:
Colin Cross
2019-01-21 14:07:13 -08:00
committed by android-build-merger
parent 3b46950ae9 e8f1a420bc
commit 88f4dac397
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/soong_java_prebuilt.mk
View File

@@ -95,7 +95,10 @@ ifdef LOCAL_SOONG_DEX_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,$(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
java-dex : $(LOCAL_BUILT_MODULE)