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

Commit 5b73ab34 authored by Colin Cross's avatar Colin Cross
Browse files

Disable duplicates warnings when merging jars 

There are too many duplicates warnings, disable them until someone
is actually looking at them.

Bug: 69316739
Test: m checkbuild
Change-Id: Ifb67dbf7734b5f53941d110f578c4fe642e36005
parent 9c339a76

core/host_dalvik_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ $(full_classes_combined_jar): $(full_classes_compiled_jar) \ 
                              $(full_static_java_libs)  | $(MERGE_ZIPS)

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

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

core/host_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ $(full_classes_combined_jar): $(full_classes_compiled_jar) \ 
                              $(full_static_java_libs) | $(MERGE_ZIPS)

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

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

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ $(full_classes_combined_jar): $(full_classes_compiled_jar) \ 
                              $(full_static_java_libs) | $(MERGE_ZIPS)

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

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