From 896c30a65ff3a2a8d11a4dd1eea29c2c415ae473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Gjesse?= <sgjesse@google.com>
Date: Wed, 29 Nov 2017 15:58:04 +0100
Subject: [PATCH] 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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/config.mk b/core/config.mk
index 4bae6b39f..bf1818ad0 100644
--- 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
 #