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

Commit abbb6a1f authored by Nan Zhang's avatar Nan Zhang Committed by android-build-merger
Browse files

Merge "Move private_manifest file insertion to jars merging phase." am: 3d6aaa2f 

am: d43952b8

Change-Id: I79d1548bbaa763e3756bbf1487fa187c821ea925
parents 35b1a46b d43952b8

core/definitions.mk

+1 −6
Original line number Diff line number Diff line
@@ -2269,12 +2269,7 @@ $(if $(PRIVATE_JAR_PACKAGES), \ 
$(if $(PRIVATE_JAR_EXCLUDE_PACKAGES), $(hide) rm -rf \

    $(foreach pkg, $(PRIVATE_JAR_EXCLUDE_PACKAGES), \

        $(PRIVATE_CLASS_INTERMEDIATES_DIR)/$(subst .,/,$(pkg))))

$(if $(PRIVATE_JAR_MANIFEST), \

    $(hide) sed -e "s/%BUILD_NUMBER%/$(BUILD_NUMBER_FROM_FILE)/" \

            $(PRIVATE_JAR_MANIFEST) > $(dir $@)/manifest.mf && \

        $(JAR) -cfm $@ $(dir $@)/manifest.mf, \

    $(hide) $(JAR) -cf $@) \

        $(call jar-args-sorted-files-in-directory,$(PRIVATE_CLASS_INTERMEDIATES_DIR))

$(hide) $(JAR) -cf $@ $(call jar-args-sorted-files-in-directory,$(PRIVATE_CLASS_INTERMEDIATES_DIR))

$(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@))

endef

core/host_dalvik_java_library.mk

+6 −5
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ $(full_classes_compiled_jar): \ 
    $(java_source_list_file) \

    $(java_sources_deps) \

    $(full_java_header_libs) \

    $(jar_manifest_file) \

    $(annotation_processor_deps) \

    $(NORMALIZE_PATH) \

    $(JAR_ARGS) \
@@ -125,7 +124,6 @@ $(full_classes_turbine_jar): \ 
    $(java_source_list_file) \

    $(java_sources_deps) \

    $(full_java_header_libs) \

    $(jar_manifest_file) \

    $(NORMALIZE_PATH) \

    $(JAR_ARGS) \

    $(ZIPTIME) \
@@ -149,8 +147,11 @@ $(eval $(call copy-one-file,$(full_classes_header_jarjar),$(full_classes_header_ 


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

$(full_classes_combined_jar): $(full_classes_compiled_jar) \

                              $(jar_manifest_file) \

                              $(full_static_java_libs)  | $(MERGE_ZIPS)

	$(MERGE_ZIPS) -j \

	$(if $(PRIVATE_JAR_MANIFEST), $(hide) sed -e "s/%BUILD_NUMBER%/$(BUILD_NUMBER_FROM_FILE)/" \

            $(PRIVATE_JAR_MANIFEST) > $(dir $@)/manifest.mf)

	$(MERGE_ZIPS) -j $(if $(PRIVATE_JAR_MANIFEST),-m $(dir $@)/manifest.mf) \

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

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

core/host_java_library.mk

+5 −2
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ $(full_classes_compiled_jar): \ 
    $(java_source_list_file) \

    $(java_sources_deps) \

    $(full_java_libs) \

    $(jar_manifest_file) \

    $(annotation_processor_deps) \

    $(NORMALIZE_PATH) \

    $(ZIPTIME) \
@@ -95,8 +94,12 @@ javac-check : $(full_classes_compiled_jar) 
javac-check-$(LOCAL_MODULE) : $(full_classes_compiled_jar)



$(full_classes_combined_jar): $(full_classes_compiled_jar) \

                              $(jar_manifest_file) \

                              $(full_static_java_libs) | $(MERGE_ZIPS)

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

	$(if $(PRIVATE_JAR_MANIFEST), $(hide) sed -e "s/%BUILD_NUMBER%/$(BUILD_NUMBER_FROM_FILE)/" \

            $(PRIVATE_JAR_MANIFEST) > $(dir $@)/manifest.mf)

	$(MERGE_ZIPS) -j $(if $(PRIVATE_JAR_MANIFEST),-m $(dir $@)/manifest.mf) \

            -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)),)

core/java.mk

+6 −6
Original line number Diff line number Diff line
@@ -476,7 +476,6 @@ $(full_classes_compiled_jar): \ 
    $(java_source_list_file) \

    $(java_sources_deps) \

    $(full_java_header_libs) \

    $(jar_manifest_file) \

    $(layers_file) \

    $(annotation_processor_deps) \

    $(NORMALIZE_PATH) \
@@ -490,8 +489,6 @@ $(full_classes_turbine_jar): \ 
    $(java_source_list_file) \

    $(java_sources_deps) \

    $(full_java_header_libs) \

    $(jar_manifest_file) \

    $(layers_file) \

    $(NORMALIZE_PATH) \

    $(JAR_ARGS) \

    $(ZIPTIME) \
@@ -518,8 +515,11 @@ javac-check-$(LOCAL_MODULE) : $(full_classes_compiled_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) \

                              $(jar_manifest_file) \

                              $(full_static_java_libs) | $(MERGE_ZIPS)

	$(MERGE_ZIPS) -j \

	$(if $(PRIVATE_JAR_MANIFEST), $(hide) sed -e "s/%BUILD_NUMBER%/$(BUILD_NUMBER_FROM_FILE)/" \

            $(PRIVATE_JAR_MANIFEST) > $(dir $@)/manifest.mf)

	$(MERGE_ZIPS) -j $(if $(PRIVATE_JAR_MANIFEST),-m $(dir $@)/manifest.mf) \

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

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