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

am: b26af8afbe Change-Id: I14744ab02e91aecaff666c3350cc5082db21404c
2017-11-03 03:40:42 +00:00 · 2017-11-03 03:40:42 +00:00 · 7b1301a593
parent 365bb41b01 b26af8afbe
commit 7b1301a593
1 changed files with 6 additions and 0 deletions
--- a/core/config.mk
+++ b/core/config.mk
@ -517,6 +517,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
 #