commit e57c1d03e0e2bb51282789ae5d8b9993049ec15f
author Colin Cross <ccross@android.com> Thu Mar 22 23:51:58 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 22 23:51:58 2018 +0000
tree 536a7bf083eb3f88cb4f20e424c013a9c3fa1e05
parent d86c6190a745450ec1b52cde4b47eca5ab0bc960
parent a5b6b5021c2c026743af4067ea1a431faec1134b

Merge "Silence more duplicate path warnings" into pi-dev

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 1309351..a872550 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2299,9 +2299,9 @@
     $(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,$@)