Merge "Switch from jack to javac for unbundled builds"

2017-09-27 03:26:13 +00:00 · 2017-09-27 03:26:13 +00:00 · 355de0a00d
parent b182ea7bcb 210e530342
commit 355de0a00d
1 changed files with 1 additions and 6 deletions
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@ -12,14 +12,9 @@ ifndef ANDROID_COMPILE_WITH_JACK
    # TODO(b/64113890, b/35788202): remove PRODUCT_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
-    endif
 endif

 ifdef TARGET_BUILD_APPS