Merge "Prepare for switching from Proguard to R8"

am: 6af8e92040 Change-Id: I26b648931723476a5cd0c9208c07352466abcc2c
2017-12-01 06:48:18 +00:00 · 2017-12-01 06:48:18 +00:00 · efbd35a247
parent 1fa4c44c3b 6af8e92040
commit efbd35a247
1 changed files with 5 additions and 0 deletions
--- a/core/config.mk
+++ b/core/config.mk
@ -542,6 +542,11 @@ ifndef USE_D8
  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
 #