From 013a37b760153253828abc4eb3b22cde6c31fa58 Mon Sep 17 00:00:00 2001
From: Alan Leung <acleung@google.com>
Date: Tue, 3 Oct 2017 15:35:18 -0700
Subject: [PATCH] Add USE_D8_BY_DEFAULT in makefile.

Bug: 65854021
Test: m USE_D8=true  showcommands out/target/common/obj/JAVA_LIBRARIES/okhttp_intermediates/with-local/classes.dex
Change-Id: Iec1a05bf6f03cf856faf2e013fa169e1a0beaf7a
---
 core/config.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/config.mk b/core/config.mk
index 34e968174a..566faaeee4 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -511,6 +511,12 @@ endif
 
 USE_PREBUILT_SDK_TOOLS_IN_PLACE := true
 
+# USE_D8_BY_DEFAULT is the default behavior, use USE_D8 to override.
+USE_D8_BY_DEFAULT := false
+ifndef USE_D8
+  USE_D8 := $(USE_D8_BY_DEFAULT)
+endif
+
 #
 # Tools that are prebuilts for TARGET_BUILD_APPS
 #