commit 4b7074e249f2334a99979daeed490b2cb7616fa8
author Colin Cross <ccross@android.com> Wed May 03 04:36:27 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 03 04:36:28 2017 +0000
tree 873aa30729139f71930c9b1f46fb1a19d1fa4564
parent 328290459dc6ede45866d5918aff9a3f0c52c4d5
parent f899251e120a9de1fbf5b5062a6d729ab746dd8b

Merge "Clear LOCAL_JACK_ENABLED for ANDROID_COMPILE_WITH_JACK=false"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 9475549..583909d 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -610,7 +610,11 @@
 FAT16COPY := build/tools/fat16copy.py
 CHECK_LINK_TYPE := build/tools/check_link_type.py
 
+ifeq ($(ANDROID_COMPILE_WITH_JACK),true)
 DEFAULT_JACK_ENABLED:=full
+else
+DEFAULT_JACK_ENABLED:=
+endif
 ifneq ($(ANDROID_JACK_EXTRA_ARGS),)
 JACK_DEFAULT_ARGS :=
 DEFAULT_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS)