From db9f6e13c8d57ff7e7b59b640323d7c49b2487c7 Mon Sep 17 00:00:00 2001 From: Po Hu Date: Wed, 17 Mar 2021 17:01:50 +0800 Subject: Fix build break for Android.bp dex_import 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 --- core/soong_java_prebuilt.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index c60017834e..c4e8a61173 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -120,9 +120,11 @@ 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))) - ifneq ($(TURBINE_ENABLED),false) - $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_header_jar))) + ifdef LOCAL_SOONG_CLASSES_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 @@ -153,8 +155,10 @@ ifdef LOCAL_SOONG_DEXPREOPT_CONFIG $(eval $(call copy-one-file,$(LOCAL_SOONG_DEXPREOPT_CONFIG), $(call local-intermediates-dir,)/dexpreopt.config)) endif +ifdef LOCAL_SOONG_CLASSES_JAR javac-check : $(full_classes_jar) javac-check-$(LOCAL_MODULE) : $(full_classes_jar) +endif .PHONY: javac-check-$(LOCAL_MODULE) ifndef LOCAL_IS_HOST_MODULE -- cgit v1.2.3