commit 480ee2e58c88e1c6ea419e9053c05deb40ce43ea
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 28 00:34:50 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 28 00:34:50 2017 +0000
tree 4bc8fc0598089f26d20e468dbde37a486e19989a
parent 9ce6d963f2ccbebd814f37a335d35b1ceb32ba19
parent 6684528a6d749192fb0a00b81871630d3c640d56

Merge "Disable jack completely"

core/combo/javac.mk

diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index cb034e9..41ebc57 100644
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@@ -8,14 +8,7 @@
 #   ANDROID_JAVA_TOOLCHAIN -- Directory that contains javac and other java tools
 #
 
-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
-        ANDROID_COMPILE_WITH_JACK := false
-    endif
-endif
+ANDROID_COMPILE_WITH_JACK := false
 
 ifdef TARGET_BUILD_APPS
   ifndef TURBINE_ENABLED