Disable duplicates warnings when merging jars am: f91a08caca

am: c40d9b1e7f Change-Id: I0bee8459b737a48941109d50e81c83d6048628a6
2018-02-08 08:56:29 +00:00 · 2018-02-08 08:56:29 +00:00 · bd828daf68
commit bd828daf68
parent 5fcb0c5420 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")