StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable duplicates warnings when merging jars

Browse Source 
am: f91a08caca

Change-Id: I722984453c53cedf77cea8493c7185b8c8c6756d
This commit is contained in:
Colin Cross
2018-02-08 08:51:58 +00:00
committed by android-build-merger
parent 5f45e9b1a6 f91a08caca
commit c40d9b1e7f
1 changed files with 1 additions and 1 deletions
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", 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")