commit c66d297e0a07230d69cd39d75f31e8f101ba4a6c
author Søren Gjesse <sgjesse@google.com> Tue Nov 07 16:18:28 2017 +0100
committer Søren Gjesse <sgjesse@google.com> Tue Nov 07 16:21:50 2017 +0100
tree 92f62e7fcb6839c1602d44f386067f7cb6b3e796
parent dcd46870f28d6a1e3c1bb24612d14ae9894b3a15

Use prebuild R8 for USE_R8=true

Instead of building R8 from external/r8 use the prebuild jar in
prebuilds/r8.

Test: m -j USE_R8=true

Change-Id: I9680ae430cdbc2b3beb910873c8eed27354f6af1

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 68854d8..c7799b0 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2795,7 +2795,7 @@
 ###########################################################
 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) \