Merge "Prepare for switching from Proguard to R8" am: 6af8e92040

am: efbd35a247 Change-Id: Ibdb3a91401eeab8d9b9fddf738d359419887ea84
2017-12-01 06:50:23 +00:00 · 2017-12-01 06:50:23 +00:00 · c35d6f16c4
parent e71a29b6c8 efbd35a247
commit c35d6f16c4
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
 #