commit 896c30a65ff3a2a8d11a4dd1eea29c2c415ae473
author Søren Gjesse <sgjesse@google.com> Wed Nov 29 15:58:04 2017 +0100
committer Søren Gjesse <sgjesse@google.com> Thu Nov 30 08:34:00 2017 +0100
tree f197416bd5937ce8f7f98b64f5828a86469a6e3b
parent 8552bebed4ce5c5c896b1eb71d8e2fb39d3aaeba

Prepare for switching from Proguard to R8

Test: m -j PRODUCT-asop_x86-userdebug
Test: Check that no *.vdex files in the image are generated by R8

Change-Id: Ifd85d485fa5b6148723378a15c5faef849381ce1

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 4bae6b3..bf1818a 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -542,6 +542,11 @@
   USE_D8 := true
 endif
 
+# Default R8 behavior when USE_R8 is not specified.
+ifndef USE_R8
+  USE_R8 := false
+endif
+
 #
 # Tools that are prebuilts for TARGET_BUILD_APPS
 #