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

Commit 8998d574 authored by Yohann Roussel's avatar Yohann Roussel
Browse files

Allow control of jack used for compilation 

Version of Jack used to compile a module can now be control from
a dedicated mk located in prebuilts/sdk/tools

Bug: 24564814

(cherry picked from commit b68c9a49)

Change-Id: I7809dc966026ff94b5cb2daa7e2c63762ca4768d
parent b2c55584

core/config.mk

+0 −6
Original line number Diff line number Diff line
@@ -486,12 +486,6 @@ DEFAULT_JACK_ENABLED:=full 
else

DEFAULT_JACK_ENABLED:=

endif

# call jack

#

# $(1): jack perf arguments

define call-jack

$(JACK) $(1)

endef

ifneq ($(ANDROID_JACK_EXTRA_ARGS),)

DEFAULT_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS)

else

core/configure_local_jack.mk

+8 −0
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
ifdef ANDROID_FORCE_JACK_ENABLED

LOCAL_JACK_ENABLED := $(ANDROID_FORCE_JACK_ENABLED)

endif



LOCAL_JACK_ENABLED := $(strip $(LOCAL_JACK_ENABLED))



ifneq ($(LOCAL_JACK_ENABLED),full)

ifneq ($(LOCAL_JACK_ENABLED),incremental)

ifdef LOCAL_JACK_ENABLED
@@ -28,3 +30,9 @@ endif 
LOCAL_JACK_ENABLED :=

endif

endif



ifdef $(LOCAL_MODULE).JACK_VERSION

LOCAL_JACK_VERSION := $($(LOCAL_MODULE).JACK_VERSION)

else

LOCAL_JACK_VERSION := $(JACK_DEFAULT_VERSION)

endif

core/definitions.mk

+7 −0
Original line number Diff line number Diff line
@@ -1777,6 +1777,13 @@ define unzip-jar-files 
  $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,;rm -rf $(2)/META-INF)

endef



# Call jack

#

# $(1): jack extra arguments

define call-jack

 JACK_VERSION=$(PRIVATE_JACK_VERSION) $(JACK) $(1)

endef



# Common definition to invoke javac on the host and target.

#

# Some historical notes:

core/host_dalvik_java_library.mk

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ endif 


$(built_dex): PRIVATE_CLASSES_JACK := $(full_classes_jack)

$(built_dex): PRIVATE_JACK_FLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JACK_FLAGS)

$(built_dex): PRIVATE_JACK_VERSION := $(LOCAL_JACK_VERSION)

$(built_dex): $(java_sources) $(java_resource_sources) $(full_jack_lib_deps) \

        $(jar_manifest_file) $(proto_java_sources_file_stamp) $(LOCAL_MODULE_MAKEFILE_DEP) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK)

core/host_dalvik_static_java_library.mk

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ include $(BUILD_SYSTEM)/host_java_library.mk 
# proguard is not supported

# *.proto files are not supported

$(full_classes_jack): PRIVATE_JACK_FLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JACK_FLAGS)

$(full_classes_jack): PRIVATE_JACK_VERSION := $(LOCAL_JACK_VERSION)

$(full_classes_jack): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)

$(full_classes_jack): \

	PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc