Merge "Fix manifest merging flags"

This commit is contained in:
Treehugger Robot
2018-08-29 21:04:35 +00:00
committed by Gerrit Code Review

View File

@@ -68,7 +68,7 @@ func manifestMerger(ctx android.ModuleContext, manifest android.Path, sdkContext
Implicits: staticLibManifests, Implicits: staticLibManifests,
Output: mergedManifest, Output: mergedManifest,
Args: map[string]string{ Args: map[string]string{
"libs": android.JoinWithPrefix(staticLibManifests.Strings(), "--uses-library "), "libs": android.JoinWithPrefix(staticLibManifests.Strings(), "--libs "),
}, },
}) })
manifest = mergedManifest manifest = mergedManifest