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

Commit 9bd54059 authored by Nan Zhang's avatar Nan Zhang
Browse files

Use merge_zips to merge jars during Java build in Make. 

1. Use merge_zips to merge jars without unzipping/rezipping static Java
libraries. And seperate merging process as a independent Make target so
that Javac can only depend on Turbine.

2. Remove duplicate vars: "full_java_lib_deps" in droiddoc.mk

3. Also use classes-header.jar for link_apk & link_instr

Bug: b/65455145
Test: m clean && m -j32

Change-Id: I7b0307664a6b86075c983284fce099bd3946318c
parent 729a221a

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ IJAR := $(prebuilt_build_tools_bin)/ijar 
MAKEPARALLEL := $(prebuilt_build_tools_bin)/makeparallel

SOONG_JAVAC_WRAPPER := $(SOONG_HOST_OUT_EXECUTABLES)/soong_javac_wrapper

SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip

MERGE_ZIPS := $(SOONG_HOST_OUT_EXECUTABLES)/merge_zips

ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip

ZIPTIME := $(prebuilt_build_tools_bin)/ziptime

core/definitions.mk

+5 −7
Original line number Diff line number Diff line
@@ -2243,7 +2243,6 @@ $(hide) rm -f $@ 
$(hide) rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) $(PRIVATE_ANNO_INTERMEDIATES_DIR)

$(hide) mkdir -p $(dir $@)

$(hide) mkdir -p $(PRIVATE_CLASS_INTERMEDIATES_DIR) $(PRIVATE_ANNO_INTERMEDIATES_DIR)

$(call unzip-jar-files,$(PRIVATE_STATIC_JAVA_LIBRARIES),$(PRIVATE_CLASS_INTERMEDIATES_DIR))

$(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) ] ; then \

    $(SOONG_JAVAC_WRAPPER) $(1) -encoding UTF-8 \

    $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \
@@ -2291,19 +2290,18 @@ define transform-java-to-header.jar 
@mkdir $(dir $@)/classes-turbine

$(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) ] ; then \

    $(JAVA) -jar $(TURBINE) \

    --output $@.tmp --temp_dir $(dir $@)/classes-turbine -$(PRIVATE_BOOTCLASSPATH) \

    --output $@.premerged --temp_dir $(dir $@)/classes-turbine -$(PRIVATE_BOOTCLASSPATH) \

    --sources \@$(PRIVATE_JAVA_SOURCE_LIST) \

    --javacopts $(PRIVATE_JAVACFLAGS) $(COMMON_JDK_FLAGS) \

    $(addprefix --classpath ,$(strip \

        $(call normalize-path-list,$(PRIVATE_ALL_JAVA_HEADER_LIBRARIES)))) \

    || ( rm -rf $(dir $@)/classes-turbine ; exit 41 ) \

fi

$(hide) $(call unzip-jar-files,$(PRIVATE_STATIC_JAVA_HEADER_LIBRARIES),$(dir $@)/classes-turbine)

$(hide) if [ -s $@.tmp ] ; then \

    unzip -qo $@.tmp -d $(dir $@)/classes-turbine; rm -f $(dir $@)/classes-turbine/module-info.class; \

$(hide) if [ -s $@.premerged ] ; then \

    $(MERGE_ZIPS) -j -stripDir META-INF $@.tmp $@.premerged $(call reverse-list,$(PRIVATE_STATIC_JAVA_HEADER_LIBRARIES)) ; \

else \

    $(MERGE_ZIPS) -j -stripDir META-INF $@.tmp $(call reverse-list,$(PRIVATE_STATIC_JAVA_HEADER_LIBRARIES)) ; \

fi

$(hide) $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,$(hide) rm -rf $(dir $@)/classes-turbine/META-INF)

$(hide) $(JAR) -cf $@.tmp $(call jar-args-sorted-files-in-directory,$(dir $@)/classes-turbine)

$(hide) $(ZIPTIME) $@.tmp

$(hide) $(call commit-change-for-toc,$@)

endef

core/droiddoc.mk

+2 −4
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ ifeq ($(LOCAL_IS_HOST_MODULE),true) 
$(full_target): PRIVATE_BOOTCLASSPATH :=

full_java_libs := $(addprefix $(HOST_OUT_JAVA_LIBRARIES)/,\

  $(addsuffix $(COMMON_JAVA_PACKAGE_SUFFIX),$(LOCAL_JAVA_LIBRARIES)))

full_java_lib_deps := $(full_java_libs)



else
@@ -83,7 +82,6 @@ endif # LOCAL_SDK_VERSION 
LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))



full_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES)) $(LOCAL_CLASSPATH)

full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES)) $(LOCAL_CLASSPATH)

endif # !LOCAL_IS_HOST_MODULE



$(full_target): PRIVATE_CLASSPATH := $(call normalize-path-list,$(full_java_libs))
@@ -174,7 +172,7 @@ $(full_target): \ 
        $(droiddoc_templates) \

        $(droiddoc) \

        $(html_dir_files) \

        $(full_java_lib_deps) \

        $(full_java_libs) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

	@echo Docs droiddoc: $(PRIVATE_OUT_DIR)

	$(hide) mkdir -p $(dir $@)
@@ -226,7 +224,7 @@ else 
$(full_target): PRIVATE_BOOTCLASSPATH_ARG := $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH))

endif



$(full_target): $(full_src_files) $(full_java_lib_deps)

$(full_target): $(full_src_files) $(full_java_libs)

	@echo Docs javadoc: $(PRIVATE_OUT_DIR)

	@mkdir -p $(dir $@)

	$(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \

core/host_dalvik_java_library.mk

+13 −4
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ full_classes_turbine_jar := $(intermediates.COMMON)/classes-turbine.jar 
full_classes_header_jarjar := $(intermediates.COMMON)/classes-header-jarjar.jar

full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar

full_classes_compiled_jar := $(intermediates.COMMON)/classes-full-debug.jar

full_classes_combined_jar := $(intermediates.COMMON)/classes-combined.jar

full_classes_desugar_jar := $(intermediates.COMMON)/desugar.classes.jar

full_classes_jarjar_jar := $(intermediates.COMMON)/classes-jarjar.jar

full_classes_jar := $(intermediates.COMMON)/classes.jar
@@ -57,6 +58,7 @@ java_source_list_file := $(intermediates.COMMON)/java-source-list 
LOCAL_INTERMEDIATE_TARGETS += \

    $(full_classes_turbine_jar) \

    $(full_classes_compiled_jar) \

    $(full_classes_combined_jar) \

    $(full_classes_desugar_jar) \

    $(full_classes_jarjar_jar) \

    $(full_classes_jack) \
@@ -110,7 +112,6 @@ $(full_classes_compiled_jar): \ 
    $(java_source_list_file) \

    $(java_sources_deps) \

    $(full_java_header_libs) \

    $(full_static_java_libs) \

    $(jar_manifest_file) \

    $(annotation_processor_deps) \

    $(NORMALIZE_PATH) \
@@ -128,7 +129,8 @@ $(full_classes_turbine_jar): \ 
    $(NORMALIZE_PATH) \

    $(JAR_ARGS) \

    $(ZIPTIME) \

    | $(TURBINE)

    | $(TURBINE) \

    $(MERGE_ZIPS)

	$(transform-java-to-header.jar)



.KATI_RESTAT: $(full_classes_turbine_jar)
@@ -145,14 +147,21 @@ endif 


$(eval $(call copy-one-file,$(full_classes_header_jarjar),$(full_classes_header_jar)))



$(full_classes_combined_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF)

$(full_classes_combined_jar): $(full_classes_compiled_jar) \

                              $(full_static_java_libs)  | $(MERGE_ZIPS)

	$(MERGE_ZIPS) -j \

        $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,-stripDir META-INF -zipToNotStrip $<) \

        $@ $< $(call reverse-list,$(PRIVATE_STATIC_JAVA_LIBRARIES))



# Run jarjar if necessary, otherwise just copy the file.

ifneq ($(strip $(LOCAL_JARJAR_RULES)),)

$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)

$(full_classes_jarjar_jar): $(full_classes_compiled_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)

$(full_classes_jarjar_jar): $(full_classes_combined_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)

	@echo JarJar: $@

	$(hide) $(JAVA) -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@

else

full_classes_jarjar_jar := $(full_classes_compiled_jar)

full_classes_jarjar_jar := $(full_classes_combined_jar)

endif



$(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar)))

core/host_java_library.mk

+10 −4
Original line number Diff line number Diff line
@@ -36,11 +36,13 @@ full_classes_jarjar_jar := $(intermediates.COMMON)/classes-jarjar.jar 
full_classes_jar := $(intermediates.COMMON)/classes.jar

java_source_list_file := $(intermediates.COMMON)/java-source-list

full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar

full_classes_combined_jar := $(intermediates.COMMON)/classes-combined.jar



LOCAL_INTERMEDIATE_TARGETS += \

    $(full_classes_compiled_jar) \

    $(full_classes_jarjar_jar) \

    $(java_source_list_file)

    $(java_source_list_file) \

    $(full_classes_combined_jar)



#######################################

include $(BUILD_SYSTEM)/base_rules.mk
@@ -79,7 +81,7 @@ $(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_PACKAGES := 
$(full_classes_compiled_jar): \

    $(java_source_list_file) \

    $(java_sources_deps) \

    $(full_java_lib_deps) \

    $(full_java_libs) \

    $(jar_manifest_file) \

    $(annotation_processor_deps) \

    $(NORMALIZE_PATH) \
@@ -92,14 +94,18 @@ $(full_classes_compiled_jar): \ 
javac-check : $(full_classes_compiled_jar)

javac-check-$(LOCAL_MODULE) : $(full_classes_compiled_jar)



$(full_classes_combined_jar): $(full_classes_compiled_jar) \

                              $(full_static_java_libs) | $(MERGE_ZIPS)

	$(MERGE_ZIPS) -j -stripDir META-INF -zipToNotStrip $< $@ $< $(call reverse-list,$(PRIVATE_STATIC_JAVA_LIBRARIES))



# Run jarjar if necessary, otherwise just copy the file.

ifneq ($(strip $(LOCAL_JARJAR_RULES)),)

$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)

$(full_classes_jarjar_jar): $(full_classes_compiled_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)

$(full_classes_jarjar_jar): $(full_classes_combined_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)

	@echo JarJar: $@

	$(hide) $(JAVA) -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@

else

full_classes_jarjar_jar := $(full_classes_compiled_jar)

full_classes_jarjar_jar := $(full_classes_combined_jar)

endif