commit 65168a41432193a4f510f8b52f6ae7d3259fe8df
author Alan Leung <acleung@google.com> Wed Nov 01 17:49:52 2017 -0700
committer Alan Leung <acleung@google.com> Thu Nov 02 15:31:03 2017 -0700
tree 1f44585ec6580d7fa3a71b94d47b733fefe5a38d
parent dee5abd85aed47a5e45fb5ea0c3d406855878f34

Workaround for USE_D8 not in --dumpvars-mode

Bug: 68406220
Test: m checkbuild && USE_D8=false m checkbuild
Change-Id: Ia9916fb69b22449ff9eadd334f135807d999276f

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index ddedc5b..dca7289 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -516,6 +516,12 @@
 
 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
 #