From f91a08caca76559feaa12e742abcd1e5f4284fd2 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 7 Feb 2018 15:41:31 -0800
Subject: [PATCH] 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: I7b3315f999dff1c01b6df37ab5ca83f7b8a60bd9
---
 java/builder.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/builder.go b/java/builder.go
index 7273290e2..2fd4ac047 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -130,7 +130,7 @@ var (
 
 	combineJar = pctx.AndroidStaticRule("combineJar",
 		blueprint.RuleParams{
-			Command:     `${config.MergeZipsCmd} -j $jarArgs $out $in`,
+			Command:     `${config.MergeZipsCmd} --ignore-duplicates -j $jarArgs $out $in`,
 			CommandDeps: []string{"${config.MergeZipsCmd}"},
 		},
 		"jarArgs")