From 65168a41432193a4f510f8b52f6ae7d3259fe8df Mon Sep 17 00:00:00 2001
From: Alan Leung <acleung@google.com>
Date: Wed, 1 Nov 2017 17:49:52 -0700
Subject: [PATCH] Workaround for USE_D8 not in --dumpvars-mode

Bug: 68406220
Test: m checkbuild && USE_D8=false m checkbuild
Change-Id: Ia9916fb69b22449ff9eadd334f135807d999276f
---
 core/config.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/config.mk b/core/config.mk
index ddedc5b25..dca72899a 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -516,6 +516,12 @@ endif
 
 USE_PREBUILT_SDK_TOOLS_IN_PLACE := true
 
+# Work around for b/68406220
+# This should match the soong version.
+ifndef USE_D8
+  USE_D8 := true
+endif
+
 #
 # Tools that are prebuilts for TARGET_BUILD_APPS
 #