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

Commit 9214a26c authored by Yohann Roussel's avatar Yohann Roussel
Browse files

Always start jack server before first call to jack 

Also install and update the server if necessary.

The target start-jack-server produces no file so it's always built.
Since the dependency is "order only", it doesn't cause force rebuilt of
jack targets after start-jack-server execution.

Bug: 25443108

Change-Id: I1608d87d186694d47307e00337b1905f0b8079c4
parent 153af5a2

core/host_dalvik_java_library.mk

+1 −1
Original line number Original line 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): PRIVATE_JACK_VERSION := $(LOCAL_JACK_VERSION)

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

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

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

        $(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: $@

	@echo Building with Jack: $@

	$(jack-java-to-dex)

	$(jack-java-to-dex)

core/host_dalvik_static_java_library.mk

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

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

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

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

        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \

        $(JACK)

        $(JACK) | setup-jack-server

	@echo Building with Jack: $@

	@echo Building with Jack: $@

	$(java-to-jack)

	$(java-to-jack)

core/java.mk

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

        $(LOCAL_MODULE_MAKEFILE_DEP) $(JACK)





ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)

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: $@

	@echo Building with Jack: $@

	$(java-to-jack)

	$(java-to-jack)





else #LOCAL_IS_STATIC_JAVA_LIBRARY

else #LOCAL_IS_STATIC_JAVA_LIBRARY

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

$(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: $@

	@echo Building with Jack: $@

	$(jack-java-to-dex)

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

$(noshrob_classes_jack): PRIVATE_JACK_INCREMENTAL_DIR :=

endif

endif

$(noshrob_classes_jack): PRIVATE_JACK_PROGUARD_FLAGS :=

$(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: $@

	@echo Building with Jack: $@

	$(java-to-jack)

	$(java-to-jack)

endif  # full_classes_jar is defined

endif  # full_classes_jar is defined

core/main.mk

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

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

-include $(TOPDIR)prebuilts/sdk/tools/jack_for_module.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

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

core/prebuilt_internal.mk

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

ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)

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

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

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

$(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)

	$(transform-jar-to-jack)





endif # JAVA_LIBRARIES

endif # JAVA_LIBRARIES