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

Commit 8639879e authored by Søren Gjesse's avatar Søren Gjesse Committed by Gerrit Code Review
Browse files

Merge "Use prebuild R8 for USE_R8=true"

parents f599f401 c66d297e

core/config.mk

+2 −2
Original line number Diff line number Diff line
@@ -531,7 +531,6 @@ ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) 
  SIGNAPK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)

  SIGNAPK_JNI_LIBRARY_PATH := $(HOST_OUT_SHARED_LIBRARIES)

  ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign

  R8 := $(HOST_OUT_EXECUTABLES)/r8



else # TARGET_BUILD_APPS || TARGET_BUILD_PDK

  AIDL := $(prebuilt_sdk_tools_bin)/aidl
@@ -542,9 +541,10 @@ else # TARGET_BUILD_APPS || TARGET_BUILD_PDK 
  SIGNAPK_JAR := $(prebuilt_sdk_tools)/lib/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)

  SIGNAPK_JNI_LIBRARY_PATH := $(prebuilt_sdk_tools)/$(HOST_OS)/lib64

  ZIPALIGN := $(prebuilt_sdk_tools_bin)/zipalign

  R8 := $(prebuilt_build_tools_wrappers)/r8

endif # TARGET_BUILD_APPS || TARGET_BUILD_PDK



R8_COMPAT_PROGUARD_JAR := prebuilts/r8/compatproguard-master.jar



ifeq (,$(TARGET_BUILD_APPS))

  # Use RenderScript prebuilts for unbundled builds but not PDK builds

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

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -2795,7 +2795,7 @@ endif 
###########################################################

define transform-jar-to-dex-r8

@echo R8: $@

$(hide) $(R8) -injars '$<$(PRIVATE_PROGUARD_INJAR_FILTERS)' \

$(hide) $(JAVA) -jar $(R8_COMPAT_PROGUARD_JAR) -injars '$<$(PRIVATE_PROGUARD_INJAR_FILTERS)' \

    --min-api $(PRIVATE_MIN_SDK_VERSION) \

    --force-proguard-compatibility --output $(subst classes.dex,,$@) \

    $(PRIVATE_PROGUARD_FLAGS) \

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ my_r8 := true 
$(built_dex_intermediate): PRIVATE_PROGUARD_INJAR_FILTERS := $(proguard_injar_filters)

$(built_dex_intermediate): PRIVATE_EXTRA_INPUT_JAR := $(extra_input_jar)

$(built_dex_intermediate): PRIVATE_PROGUARD_FLAGS := $(legacy_proguard_flags) $(common_proguard_flags) $(LOCAL_PROGUARD_FLAGS)

$(built_dex_intermediate) : $(full_classes_proguard_jar) $(extra_input_jar) $(my_support_library_sdk_raise) $(common_proguard_flag_files) $(proguard_flag_files) $(legacy_proguard_lib_deps) $(R8)

$(built_dex_intermediate) : $(full_classes_proguard_jar) $(extra_input_jar) $(my_support_library_sdk_raise) $(common_proguard_flag_files) $(proguard_flag_files) $(legacy_proguard_lib_deps) $(R8_COMPAT_PROGUARD_JAR)

	$(transform-jar-to-dex-r8)

endif # USE_R8

endif # LOCAL_PROGUARD_ENABLED