Merge "Workaround for USE_D8 not in --dumpvars-mode" am: 44bfeedaa3

am: ad24414dae Change-Id: Ifa370b15120411f813e15a4210f70ec3fc0b69d6
2017-11-03 03:38:34 +00:00 · 2017-11-03 03:38:34 +00:00 · b26af8afbe
parent ed6f6bc272 ad24414dae
commit b26af8afbe
1 changed files with 6 additions and 0 deletions
--- 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
 #