Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db9f6e13 authored by Po Hu's avatar Po Hu
Browse files

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
parent 2245dee0

core/soong_java_prebuilt.mk

+7 −3
Original line number Diff line number Diff line
@@ -120,11 +120,13 @@ 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)))

    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



  java-dex : $(LOCAL_BUILT_MODULE)

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))

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