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

Commit efc311b3 authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge "Make classes.jar the output of uninstallable Soong Java modules" 

am: cf915464

Change-Id: Ic090bb36a6b6f12db2f5416a1c504dc6341eca4c
parents 808b06d6 cf915464

core/soong_java_prebuilt.mk

+44 −38
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ endif 
endif # TURBINE_ENABLED != false



ifdef LOCAL_SOONG_DEX_JAR

  ifneq ($(LOCAL_UNINSTALLABLE_MODULE),true)

    ifndef LOCAL_IS_HOST_MODULE

      ifneq ($(filter $(LOCAL_MODULE),$(PRODUCT_BOOT_JARS)),)  # is_boot_jar

        $(eval $(call hiddenapi-copy-soong-jar,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
@@ -119,9 +120,14 @@ $(built_odex) : $(dir $(LOCAL_BUILT_MODULE))% : $(common_javalib.jar) 
    endif



    java-dex : $(LOCAL_BUILT_MODULE)

else

  else  # LOCAL_UNINSTALLABLE_MODULE

    $(eval $(call copy-one-file,$(full_classes_jar),$(LOCAL_BUILT_MODULE)))

endif

    $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))

    java-dex : $(common_javalib.jar)

  endif  # LOCAL_UNINSTALLABLE_MODULE

else  # LOCAL_SOONG_DEX_JAR

  $(eval $(call copy-one-file,$(full_classes_jar),$(LOCAL_BUILT_MODULE)))

endif  # LOCAL_SOONG_DEX_JAR



javac-check : $(full_classes_jar)

javac-check-$(LOCAL_MODULE) : $(full_classes_jar)