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

Commit 509ab35a authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Don't depend on classes-header.jar when turbine is disabled" am: e8f1a420 

am: 88f4dac3

Change-Id: I33fa2b41b55e23bc8ac1ccef684dc88a850cfa10
parents caf42f97 88f4dac3

core/soong_java_prebuilt.mk

+4 −1
Original line number Diff line number Diff line
@@ -95,7 +95,10 @@ 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) $(full_classes_header_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



  java-dex : $(LOCAL_BUILT_MODULE)