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

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

Merge changes Ia7feaa13,Ib917761e 

* changes:
  Add dependency on jacoco-report-classes.jar
  Fix dex_preopt with profile on a soong module
parents 94ea878a 8cd412fe

core/soong_java_prebuilt.mk

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(full_classes_pre_pro 
ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR

  $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\

    $(intermediates.COMMON)/jacoco-report-classes.jar))

  $(call add-dependency,$(common_javalib.jar),\

    $(intermediates.COMMON)/jacoco-report-classes.jar)

endif



ifneq ($(TURBINE_DISABLED),false)
@@ -41,9 +43,13 @@ ifdef LOCAL_SOONG_DEX_JAR 
    $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))

    $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar)))



    dex_preopt_profile_src_file := $(common_javalib.jar)



    # defines built_odex along with rule to install odex

    include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk



    dex_preopt_profile_src_file :=



    ifdef LOCAL_DEX_PREOPT

      ifneq ($(dexpreopt_boot_jar_module),) # boot jar

        # boot jar's rules are defined in dex_preopt.mk