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/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index c7799b0..8b4051d 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2795,7 +2795,7 @@
 ###########################################################
 define transform-jar-to-dex-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) \
     --force-proguard-compatibility --output $(subst classes.dex,,$@) \
     $(PRIVATE_PROGUARD_FLAGS) \