| commit | 1d29875829712eb37d0a1808716c94126018e52d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Feb 09 18:23:11 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Feb 09 18:23:11 2018 +0000 |
| tree | 700f8ce30144acbb4219721d34764eed684b8512 | |
| parent | f5801db4cc794efa60ab3ef5e1a996f399b4181f [diff] | |
| parent | f2ceea7f1f540d952e5d44284ef7bd682601af4c [diff] |
Merge "Disable a warning that libc++'s headers trip."
diff --git a/java/builder.go b/java/builder.go index 7273290..2fd4ac0 100644 --- a/java/builder.go +++ b/java/builder.go
@@ -130,7 +130,7 @@ 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")