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

Commit a5b6b502 authored by Colin Cross's avatar Colin Cross
Browse files

Silence more duplicate path warnings 

Silence warnings when merging header jars that were missed by
Ifb67dbf7734b5f53941d110f578c4fe642e36005.

Bug: 69316739
Test: m checkbuild
Change-Id: I5cfea62e46d99f9b315a589d8915bf62307220aa
Merged-In: I5cfea62e46d99f9b315a589d8915bf62307220aa
(cherry picked from commit f6799e85)
parent 50e87510

core/definitions.mk

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

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

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

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

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

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

fi

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

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