Merge "Clear LOCAL_JACK_ENABLED for ANDROID_COMPILE_WITH_JACK=false" (23f2379b) · Commits · e / os / android_build

core/config.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -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)