commit 7d6144d34b04cb45cf0ffc15718c4b0a6271c66e
author Alan Leung <acleung@google.com> Thu Nov 16 15:51:07 2017 -0800
committer Alan Leung <acleung@google.com> Thu Nov 16 17:24:01 2017 -0800
tree 45e0ba9c631ab9587204b07dc265fd4a8637aa83
parent 70964e80240fb44f73c99b8f6b423e9a170aea74

Rename r8 to r8-compat-proguard

Test: USE_R8=false USE_D8=true m -j32 && USE_R8=true USE_D8=true m -j32

Change-Id: I2610340cf75f8db5920e33fac542f0dcf294ce29

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 71bed38..09e5371 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -752,7 +752,7 @@
 $(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_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)
 endif # USE_R8
 endif # LOCAL_PROGUARD_ENABLED