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

Commit b2fccdd3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix build break for Android.bp dex_import"

parents fb65e893 db9f6e13

core/soong_java_prebuilt.mk

+7 −3
Original line number Diff line number Diff line
@@ -128,11 +128,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
@@ -161,8 +163,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