From f899251e120a9de1fbf5b5062a6d729ab746dd8b Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 2 May 2017 18:58:29 -0700 Subject: [PATCH] Clear LOCAL_JACK_ENABLED for ANDROID_COMPILE_WITH_JACK=false CL I2189055aac9deccc36b8eab8e949796dddadf7a1 moved the ANDROID_COMPILE_WITH_JACK=false check to configure_local_jack.mk, which broke some modules that use ifndef LOCAL_JACK_ENABLED to change their behavior we jack is disabled. Clear DEFAULT_JACK_ENABLED when ANDROID_COMPILE_WITH_JACK=false so that LOCAL_JACK_ENABLED is cleared. Bug: 37483961 Test: m -j checkbuild Change-Id: I0d08946c57182689624c57f4952d7cecaa0b82b3 --- core/config.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/config.mk b/core/config.mk index 9475549550..583909d577 100644 --- a/core/config.mk +++ b/core/config.mk @@ -610,7 +610,11 @@ DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar 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)