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

Commit 16243bdb authored by Yohann Roussel's avatar Yohann Roussel Committed by Sebastien Hertz
Browse files

Fix bad JACK_PLUGIN variable 

Changed to LOCAL_JACK_PLUGIN.

(cherry picked from commit 17924b136cb5bfc60d138e8c7e5c18a90b5965c3)

Test: Manually tested by some manual activations of the coverage plugin.
Change-Id: I1be4aaa502103fc308d35a5672dc4fe5900c4ebe
parent 53b7fbbe

core/host_dalvik_java_library.mk

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ jack_all_deps := $(java_sources) $(java_resource_sources) $(full_jack_deps) \ 
ifneq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)

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

$(built_dex): PRIVATE_JACK_PLUGIN_PATH := $(LOCAL_JACK_PLUGIN_PATH)

$(built_dex): PRIVATE_JACK_PLUGIN := $(JACK_PLUGIN)

$(built_dex): PRIVATE_JACK_PLUGIN := $(LOCAL_JACK_PLUGIN)

$(built_dex): $(jack_all_deps) $(LOCAL_JACK_PLUGIN_PATH) | setup-jack-server

	@echo Building with Jack: $@

	$(jack-java-to-dex)
@@ -106,7 +106,7 @@ $(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources) 


else  # LOCAL_IS_STATIC_JAVA_LIBRARY

$(full_classes_jack): PRIVATE_JACK_PLUGIN_PATH := $(LOCAL_JACK_PLUGIN_PATH)

$(full_classes_jack): PRIVATE_JACK_PLUGIN := $(JACK_PLUGIN)

$(full_classes_jack): PRIVATE_JACK_PLUGIN := $(LOCAL_JACK_PLUGIN)

$(full_classes_jack): $(jack_all_deps) $(LOCAL_JACK_PLUGIN_PATH) | setup-jack-server

	@echo Building with Jack: $@

	$(java-to-jack)

core/java.mk

+2 −2
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ $(jack_check_timestamp): $(jack_all_deps) | setup-jack-server 


ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)

$(full_classes_jack): PRIVATE_JACK_PLUGIN_PATH := $(LOCAL_JACK_PLUGIN_PATH)

$(full_classes_jack): PRIVATE_JACK_PLUGIN := $(JACK_PLUGIN)

$(full_classes_jack): PRIVATE_JACK_PLUGIN := $(LOCAL_JACK_PLUGIN)

$(full_classes_jack): $(jack_all_deps) $(LOCAL_JACK_PLUGIN_PATH) | setup-jack-server

	@echo Building with Jack: $@

	$(java-to-jack)
@@ -679,7 +679,7 @@ $(call define-dex-to-toc-rule, $(intermediates.COMMON)) 
endif #LOCAL_IS_STATIC_JAVA_LIBRARY



$(noshrob_classes_jack): PRIVATE_JACK_PLUGIN_PATH := $(LOCAL_JACK_PLUGIN_PATH)

$(noshrob_classes_jack): PRIVATE_JACK_PLUGIN := $(JACK_PLUGIN)

$(noshrob_classes_jack): PRIVATE_JACK_PLUGIN := $(LOCAL_JACK_PLUGIN)

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

$(noshrob_classes_jack): PRIVATE_JACK_PROGUARD_FLAGS :=

$(noshrob_classes_jack): $(jack_all_deps) $(LOCAL_JACK_PLUGIN_PATH) | setup-jack-server

core/prebuilt_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ ifneq ($(prebuilt_module_is_dex_javalib),true) 
$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_FLAGS:=$(LOCAL_JACK_FLAGS)

$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_MIN_SDK_VERSION := $(if $(strip $(LOCAL_MIN_SDK_VERSION)),$(LOCAL_MIN_SDK_VERSION),1)

$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_PLUGIN_PATH := $(LOCAL_JACK_PLUGIN_PATH)

$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_PLUGIN := $(JACK_PLUGIN)

$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_PLUGIN := $(LOCAL_JACK_PLUGIN)

$(intermediates.COMMON)/classes.jack : $(LOCAL_JACK_PLUGIN_PATH) $(my_src_jar) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK_DEFAULT_ARGS) $(JACK) \

        | setup-jack-server