p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Rename r8 to r8-compat-proguard" am: 81eeb78200 

am: 4eee474504

Change-Id: I8c345ba17bf7614e64dc31456cb00f51bb248615
This commit is contained in:
Alan Leung 2017-11-17 03:18:14 +00:00 committed by android-build-merger
parent 507d6d73aa 4eee474504
commit fcc1a99442
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.mk
View File

@ -546,7 +546,7 @@ else # TARGET_BUILD_APPS || TARGET_BUILD_PDK
ZIPALIGN := $(prebuilt_sdk_tools_bin)/zipalign ZIPALIGN := $(prebuilt_sdk_tools_bin)/zipalign
endif # TARGET_BUILD_APPS || TARGET_BUILD_PDK endif # TARGET_BUILD_APPS || TARGET_BUILD_PDK
R8_COMPAT_PROGUARD_JAR := prebuilts/r8/compatproguard-master.jar R8_COMPAT_PROGUARD := $(HOST_OUT_EXECUTABLES)/r8-compat-proguard
ifeq (,$(TARGET_BUILD_APPS)) ifeq (,$(TARGET_BUILD_APPS))
# Use RenderScript prebuilts for unbundled builds but not PDK builds # Use RenderScript prebuilts for unbundled builds but not PDK builds

2
core/definitions.mk
View File

@ -2804,7 +2804,7 @@ endif
########################################################### ###########################################################
define transform-jar-to-dex-r8 define transform-jar-to-dex-r8
@echo R8: $@ @echo R8: $@
$(hide) $(JAVA) -jar $(R8_COMPAT_PROGUARD_JAR) -injars '$<$(PRIVATE_PROGUARD_INJAR_FILTERS)' \ $(hide) $(R8_COMPAT_PROGUARD) -injars '$<$(PRIVATE_PROGUARD_INJAR_FILTERS)' \
--min-api $(PRIVATE_MIN_SDK_VERSION) \ --min-api $(PRIVATE_MIN_SDK_VERSION) \
--force-proguard-compatibility --output $(subst classes.dex,,$@) \ --force-proguard-compatibility --output $(subst classes.dex,,$@) \
$(PRIVATE_PROGUARD_FLAGS) \ $(PRIVATE_PROGUARD_FLAGS) \

2
core/java.mk
View File

@ -765,7 +765,7 @@ my_r8 := true
$(built_dex_intermediate): PRIVATE_PROGUARD_INJAR_FILTERS := $(proguard_injar_filters) $(built_dex_intermediate): PRIVATE_PROGUARD_INJAR_FILTERS := $(proguard_injar_filters)
$(built_dex_intermediate): PRIVATE_EXTRA_INPUT_JAR := $(extra_input_jar) $(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): 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_COMPAT_PROGUARD_JAR) $(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)
$(transform-jar-to-dex-r8) $(transform-jar-to-dex-r8)
endif # USE_R8 endif # USE_R8
endif # LOCAL_PROGUARD_ENABLED endif # LOCAL_PROGUARD_ENABLED