From 6684528a6d749192fb0a00b81871630d3c640d56 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 27 Sep 2017 13:17:59 -0700
Subject: [PATCH] Disable jack completely

Always set ANDROID_COMPILE_WITH_JACK=false.

Bug: 65302138
Test: m -j checkbuild
Change-Id: I98dfdca27b4338048d50e016a79fbf4e3d86a020
---
 core/combo/javac.mk | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index cb034e912..41ebc5711 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