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

Commit 8798bb70 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes from topic "soong_r8" 

* changes:
  Add R8 support to Soong.
  Fix dependency on Soong jacoco report classes
parents 2c2cb338 5e0986cb

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ LOCAL_SOONG_CLASSES_JAR := 
LOCAL_SOONG_DEX_JAR :=

LOCAL_SOONG_HEADER_JAR :=

LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=

LOCAL_SOONG_PROGUARD_DICT :=

LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=

LOCAL_SOONG_RRO_DIRS :=

# '',true

core/config.mk

+0 −2
Original line number Diff line number Diff line
@@ -581,8 +581,6 @@ else # TARGET_BUILD_APPS || TARGET_BUILD_PDK 
  ZIPALIGN := $(prebuilt_build_tools_bin)/zipalign

endif # TARGET_BUILD_APPS || TARGET_BUILD_PDK



R8_COMPAT_PROGUARD := $(HOST_OUT_EXECUTABLES)/r8-compat-proguard



ifeq (,$(TARGET_BUILD_APPS))

  # Use RenderScript prebuilts for unbundled builds but not PDK builds

  LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc

core/soong_app_prebuilt.mk

+14 −7
Original line number Diff line number Diff line
@@ -13,13 +13,6 @@ LOCAL_BUILT_MODULE_STEM := package.apk 
include $(BUILD_SYSTEM)/base_rules.mk

#######################################



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



full_classes_jar := $(intermediates.COMMON)/classes.jar

full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.jar

full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar
@@ -27,6 +20,20 @@ full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar 
$(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar)))

$(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar)))



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,$(LOCAL_BUILT_MODULE),\

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

endif



ifdef LOCAL_SOONG_PROGUARD_DICT

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

    $(intermediates.COMMON)/proguard_dictionary))

  $(call add-dependency,$(LOCAL_BUILT_MODULE),\

    $(intermediates.COMMON)/proguard_dictionary)

endif



ifneq ($(TURBINE_DISABLED),false)

ifdef LOCAL_SOONG_HEADER_JAR

$(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))