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

Merge "Fix build break for Android.bp dex_import"

Browse Source
This commit is contained in:
Treehugger Robot
2021-04-09 06:00:27 +00:00
committed by Gerrit Code Review
parent fb65e89346 db9f6e13c8
commit b2fccdd318
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/soong_java_prebuilt.mk
View File

@@ -128,9 +128,11 @@ 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))) ifdef LOCAL_SOONG_CLASSES_JAR
ifneq ($(TURBINE_ENABLED),false) $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar)))
$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_header_jar))) ifneq ($(TURBINE_ENABLED),false)
$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_header_jar)))
endif
endif endif
endif endif
@@ -161,8 +163,10 @@ ifdef LOCAL_SOONG_DEXPREOPT_CONFIG
$(eval $(call copy-one-file,$(LOCAL_SOONG_DEXPREOPT_CONFIG), $(call local-intermediates-dir,)/dexpreopt.config)) $(eval $(call copy-one-file,$(LOCAL_SOONG_DEXPREOPT_CONFIG), $(call local-intermediates-dir,)/dexpreopt.config))
endif endif
ifdef LOCAL_SOONG_CLASSES_JAR
javac-check : $(full_classes_jar) javac-check : $(full_classes_jar)
javac-check-$(LOCAL_MODULE) : $(full_classes_jar) javac-check-$(LOCAL_MODULE) : $(full_classes_jar)
endif
.PHONY: javac-check-$(LOCAL_MODULE) .PHONY: javac-check-$(LOCAL_MODULE)
ifndef LOCAL_IS_HOST_MODULE ifndef LOCAL_IS_HOST_MODULE