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

Commit 91f53fdd authored by Colin Cross's avatar Colin Cross
Browse files

Remove reverse-list from java static libraries. 

Make was reversing the list of static library dependencies when passing
it to merge_zips.  This was originally done to match the behavior of
unzipping each static library in order into the same directory,
overwriting duplicates each time.  This order is counter-intuitive,
and Soong does it the sensible way (first one takes priority, the same
as the compile classpath).  Fix Make to match Soong.

Bug: 131603999
Test: m checkbuild
Test: compare target_files.zip
Change-Id: Idad125068ed2f750dc2dd95ab82bacb6e074489d
parent 0376d7dc

core/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -2094,9 +2094,9 @@ $(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) -o -n "$(PRIVATE_SRCJARS)" ] ; then 
    $(addprefix --bootclasspath ,$(strip $(PRIVATE_BOOTCLASSPATH))) \

    $(addprefix --classpath ,$(strip $(PRIVATE_ALL_JAVA_HEADER_LIBRARIES))) \

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

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

    $(MERGE_ZIPS) -j --ignore-duplicates -stripDir META-INF $@.tmp $@.premerged $(PRIVATE_STATIC_JAVA_HEADER_LIBRARIES) ; \

else \

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

    $(MERGE_ZIPS) -j --ignore-duplicates -stripDir META-INF $@.tmp $(PRIVATE_STATIC_JAVA_HEADER_LIBRARIES) ; \

fi

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

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

core/host_dalvik_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ $(full_classes_combined_jar): $(full_classes_compiled_jar) \ 
            $(PRIVATE_JAR_MANIFEST) > $(dir $@)/manifest.mf)

	$(MERGE_ZIPS) -j --ignore-duplicates $(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))

            $@ $< $(PRIVATE_STATIC_JAVA_LIBRARIES)



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

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

core/host_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ $(full_classes_combined_jar): $(full_classes_compiled_jar) \ 
            $(PRIVATE_JAR_MANIFEST) > $(dir $@)/manifest.mf)

	$(MERGE_ZIPS) -j --ignore-duplicates $(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))

            $@ $< $(PRIVATE_STATIC_JAVA_LIBRARIES)



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

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

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ $(full_classes_combined_jar): $(full_classes_compiled_jar) \ 
            $(PRIVATE_JAR_MANIFEST) > $(dir $@)/manifest.mf)

	$(MERGE_ZIPS) -j --ignore-duplicates $(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))

            $@ $< $(PRIVATE_STATIC_JAVA_LIBRARIES)



ifdef LOCAL_JAR_PROCESSOR

# LOCAL_JAR_PROCESSOR_ARGS must be evaluated here to set up the rule-local