Disable duplicates warnings when merging jars am: f91a08caca am: c40d9b1e7f

am: bd828daf68 Change-Id: Ib5d03905b5b64757c16d0e45d868bb68a23fc544
2018-02-08 09:37:35 +00:00 · 2018-02-08 09:37:35 +00:00 · dcb4d160e8
commit dcb4d160e8
parent c72573dcd1 bd828daf68
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")