commit 560184217657db94ed223bbc6fe43fd1862fb505
author Colin Cross <ccross@android.com> Tue Sep 26 16:22:00 2017 -0700
committer Colin Cross <ccross@android.com> Tue Sep 26 17:39:01 2017 -0700
tree ced5f76dbc59f0718b4fbe732dff5bacecfb9cbe
parent 7dc9043546339649566a024d0f35154e731662ad

Disable turbine for unbundled builds

We don't yet have a turbine prebuilt, so disable turbine for
unbundled builds for now.

Test: none
Change-Id: I06179fca1764a86e387c8bd154ae052e2669d15b

core/combo/javac.mk

diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index 835ee82..b09b10c 100644
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@@ -22,6 +22,12 @@
     endif
 endif
 
+ifdef TARGET_BUILD_APPS
+  ifndef TURBINE_ENABLED
+    TURBINE_ENABLED := false
+  endif
+endif
+
 ifeq ($(OVERRIDE_ANDROID_JAVA_HOME),)
 ANDROID_JAVA_HOME := prebuilts/jdk/jdk8/$(HOST_PREBUILT_TAG)
 else