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

Commit 4a017112 authored by Yohann Roussel's avatar Yohann Roussel Committed by Gerrit Code Review
Browse files

Merge "Always start jack server before first call to jack"

parents 67e960b7 9214a26c

core/host_dalvik_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ $(built_dex): PRIVATE_JACK_FLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JACK_FLA 
$(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)

        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK) | setup-jack-server

	@echo Building with Jack: $@

	$(jack-java-to-dex)

core/host_dalvik_static_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ endif 
$(full_classes_jack): $(java_sources) $(java_resource_sources) $(full_jack_lib_deps) \

        $(jar_manifest_file) $(layers_file) $(LOCAL_MODULE_MAKEFILE_DEP) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \

        $(JACK)

        $(JACK) | setup-jack-server

	@echo Building with Jack: $@

	$(java-to-jack)

core/java.mk

+3 −3
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ jack_all_deps := $(java_sources) $(java_resource_sources) $(full_jack_lib_deps) 
        $(LOCAL_MODULE_MAKEFILE_DEP) $(JACK)



ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)

$(full_classes_jack): $(jack_all_deps)

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

	@echo Building with Jack: $@

	$(java-to-jack)
@@ -666,7 +666,7 @@ $(built_dex).toc: $(full_classes_jack) 
else #LOCAL_IS_STATIC_JAVA_LIBRARY

$(built_dex_intermediate): PRIVATE_CLASSES_JACK := $(full_classes_jack)



$(built_dex_intermediate): $(jack_all_deps)

$(built_dex_intermediate): $(jack_all_deps) | setup-jack-server

	@echo Building with Jack: $@

	$(jack-java-to-dex)
@@ -687,7 +687,7 @@ else 
$(noshrob_classes_jack): PRIVATE_JACK_INCREMENTAL_DIR :=

endif

$(noshrob_classes_jack): PRIVATE_JACK_PROGUARD_FLAGS :=

$(noshrob_classes_jack): $(jack_all_deps)

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

	@echo Building with Jack: $@

	$(java-to-jack)

endif  # full_classes_jar is defined

core/main.mk

+5 −0
Original line number Diff line number Diff line
@@ -324,6 +324,11 @@ include build/core/pdk_config.mk 
-include $(TOPDIR)prebuilts/sdk/tools/jack_versions.mk

-include $(TOPDIR)prebuilts/sdk/tools/jack_for_module.mk



#

# -----------------------------------------------------------------

# Install and start Jack server

-include $(TOPDIR)prebuilts/sdk/tools/jack_server_setup.mk



# -----------------------------------------------------------------

###

### In this section we set up the things that are different

core/prebuilt_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ endif # TARGET JAVA_LIBRARIES 
ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)

$(intermediates.COMMON)/classes.jack : PRIVATE_JILL_FLAGS:=$(LOCAL_JILL_FLAGS)

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

        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JILL_JAR) $(JACK)

        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JILL_JAR) $(JACK) | setup-jack-server

	$(transform-jar-to-jack)



# Update timestamps of .toc files for prebuilts so dependents will be