Merge "Switch from jack to javac for unbundled builds"

am: 355de0a00d Change-Id: Ib281dd853420430e4e06fb0144b727e9a029be86
2017-09-27 03:33:31 +00:00 · 2017-09-27 03:33:31 +00:00 · a938462068
parent 2c717745b2 355de0a00d
commit a938462068
1 changed files with 1 additions and 6 deletions
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@ -13,12 +13,7 @@ ifndef ANDROID_COMPILE_WITH_JACK
    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