commit 37822c443d3d2ba88dd009c994f088906a0f5568
author Yohann Roussel <yroussel@google.com> Fri Jan 09 10:36:40 2015 +0100
committer Yohann Roussel <yroussel@google.com> Wed Feb 04 11:22:26 2015 +0100
tree 67e0a1da8fb38a1cf909399dc9b55d3be1b066c9
parent 2809666941aceea4af65ec6f9cea8cce1c1392ed

Engage Jack incremental on demand

Each module may engage Jack incremental with

LOCAL_JACK_ENABLED := incremental

Include renaming of LOCAL_USE_JACK to LOCAL_JACK_ENABLED that is
now accepting 3 values "disabled", "full" and "incremental".

Change-Id: Icbff275b397bee36b29312e821f3e8d45f83fbcc

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 83ef074..a79eb62 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -406,6 +406,11 @@
 E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX)
 JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar
 
+ifeq ($(ANDROID_COMPILE_WITH_JACK),true)
+DEFAULT_JACK_ENABLED:=full
+else
+DEFAULT_JACK_ENABLED:=
+endif
 ifneq ($(strip $(ANDROID_JACK_VM)),)
 JACK_VM := $(ANDROID_JACK_VM)
 else