tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build break for Android.bp dex_import

Browse source 
Error message is:
'out/target/common/obj/JAVA_LIBRARIES/x_intermediates/classes.jar',
needed by 'out/target/common/obj/JAVA_LIBRARIES/x_intermediates/jav
alib.jar', missing and no known rule to make it;

Soong Android.mk generated does not define LOCAL_SOONG_CLASSES_JAR
or LOCAL_SOONG_HEADER_JAR. So don't add them to javalib.jar's
dependencies.

Bug: 144664536
Change-Id: I6b530d40c859c6484425b8ec37c0fa7112a21346
This commit is contained in:
Po Hu 2021-03-17 17:01:50 +08:00
parent 2245dee0d7
commit db9f6e13c8
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/soong_java_prebuilt.mk
View file

@ -120,11 +120,13 @@ 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)))
ifdef LOCAL_SOONG_CLASSES_JAR
$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar))) $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar)))
ifneq ($(TURBINE_ENABLED),false) ifneq ($(TURBINE_ENABLED),false)
$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_header_jar))) $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_header_jar)))
endif endif
endif endif
endif
java-dex : $(LOCAL_BUILT_MODULE) java-dex : $(LOCAL_BUILT_MODULE)
else # LOCAL_SOONG_DEX_JAR else # LOCAL_SOONG_DEX_JAR
@ -153,8 +155,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