tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: bd828daf68

Change-Id: Ib5d03905b5b64757c16d0e45d868bb68a23fc544
This commit is contained in:
Colin Cross 2018-02-08 09:37:35 +00:00 committed by android-build-merger
commit dcb4d160e8
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/builder.go
View file

@ -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")