| commit | 97d5ed70a03fe69adc4302b0c1d362b831288ed9 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Aug 29 21:04:35 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Aug 29 21:04:35 2018 +0000 |
| tree | 08679d738913328d65755e1dd43a3179a591805d | |
| parent | fc15390b9cfc7add859cbd77ab7309b96504d924 [diff] | |
| parent | 6f937a99e312841401751244c528d7e23036280f [diff] |
Merge "Fix manifest merging flags"
diff --git a/java/android_manifest.go b/java/android_manifest.go index 77b6214..6577475 100644 --- a/java/android_manifest.go +++ b/java/android_manifest.go
@@ -68,7 +68,7 @@ Implicits: staticLibManifests, Output: mergedManifest, Args: map[string]string{ - "libs": android.JoinWithPrefix(staticLibManifests.Strings(), "--uses-library "), + "libs": android.JoinWithPrefix(staticLibManifests.Strings(), "--libs "), }, }) manifest = mergedManifest