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
This commit is contained in:
Colin Cross
2018-02-07 15:41:31 -08:00
parent bc203622e6
commit f91a08caca

View File

@@ -130,7 +130,7 @@ var (
combineJar = pctx.AndroidStaticRule("combineJar", combineJar = pctx.AndroidStaticRule("combineJar",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `${config.MergeZipsCmd} -j $jarArgs $out $in`, Command: `${config.MergeZipsCmd} --ignore-duplicates -j $jarArgs $out $in`,
CommandDeps: []string{"${config.MergeZipsCmd}"}, CommandDeps: []string{"${config.MergeZipsCmd}"},
}, },
"jarArgs") "jarArgs")