Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98d2f0e6 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Clear LOCAL_JACK_ENABLED for ANDROID_COMPILE_WITH_JACK=false" am: 4b7074e2 am: 23f2379b 

am: 5b04649f

Change-Id: I2a3c34bc91e37a2285a7a2b311243173b147faa8
parents 151cd4c7 5b04649f

core/config.mk

+4 −0
Original line number Diff line number Diff line
@@ -612,7 +612,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)