commit 210e5303421e7ec4cb0c5d867279045b177fc0df
author Colin Cross <ccross@android.com> Fri Sep 22 16:17:58 2017 -0700
committer Colin Cross <ccross@android.com> Mon Sep 25 16:15:11 2017 -0700
tree abf75f3fe0c2c3c6a7479243139859a004d6ce1e
parent 78542b9e130d3cc7486cc096cb3c70b773f35965

Switch from jack to javac for unbundled builds

Default to ANDROID_COMPILE_WITH_JACK=false when TARGET_BUILD_APPS
is set.

Test: m -j TARGET_BUILD_APPS=Gallery2
Change-Id: Ibd2bdac6c7e2c4e2c6107fd35bd049fc8cb8dafe

core/combo/javac.mk

diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index 835ee82..625ac3f 100644
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@@ -13,12 +13,7 @@
     ifdef PRODUCT_COMPILE_WITH_JACK
         ANDROID_COMPILE_WITH_JACK := $(PRODUCT_COMPILE_WITH_JACK)
     else
-        # TODO(b/62038127): remove TARGET_BUILD_APPS check
-        ifdef TARGET_BUILD_APPS
-            ANDROID_COMPILE_WITH_JACK := true
-        else
-            ANDROID_COMPILE_WITH_JACK := false
-        endif
+        ANDROID_COMPILE_WITH_JACK := false
     endif
 endif