Disable duplicates warnings when merging jars

am: f91a08caca Change-Id: I722984453c53cedf77cea8493c7185b8c8c6756d
2018-02-08 08:51:58 +00:00
parent 5f45e9b1a6 f91a08caca
commit c40d9b1e7f
1 changed files with 1 additions and 1 deletions
--- 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")