Merge "Workaround for USE_D8 not in --dumpvars-mode"

2017-11-03 03:28:51 +00:00 · 2017-11-03 03:28:51 +00:00 · 44bfeedaa3
parent 7e85dd9dc0 65168a4143
commit 44bfeedaa3
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
 #