From 268dfa4d91f077946e789e2a73b39c85d7d3a284 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 21 Jul 2017 13:54:43 -0700
Subject: [PATCH] Compile with javac by default

javac is replacing jack as the default compiler for platform builds.

Bug: 36902714
Test: m -j checkbuild
Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L50600000086240009&nodeType=Trybot
Test: sailfish-userdebug boots and basic interactions work
Test: art tests pass
Test: libcore tests pass
Change-Id: I1c3857f64eafa445ad1b9dd94eff85bef05f4649
---
 core/combo/javac.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index 36ac2aa75..64025e30f 100644
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@@ -11,7 +11,7 @@
 
 ifndef ANDROID_COMPILE_WITH_JACK
 # Defines if compilation with jack is enabled by default.
-ANDROID_COMPILE_WITH_JACK := true
+ANDROID_COMPILE_WITH_JACK := false
 endif
 
 common_jdk_flags := -Xmaxerrs 9999999