Revert "Revert "Fix manifest merging flags""

This reverts commit b0c795d78b. Reason for revert: SystemUITests fixed in b/112587252 Bug: 112587252 Bug: 112467584 Change-Id: Ie00c1923cb5f17c76ce6ff0528b1f729fdabc4f2
2018-08-14 20:03:38 +00:00
parent b0c795d78b
commit db522fc75c
1 changed files with 1 additions and 1 deletions
--- a/java/android_manifest.go
+++ b/java/android_manifest.go
@@ -68,7 +68,7 @@ func manifestMerger(ctx android.ModuleContext, manifest android.Path, sdkContext
 			Implicits: staticLibManifests,
 			Output:    mergedManifest,
 			Args: map[string]string{
-				"libs": android.JoinWithPrefix(staticLibManifests.Strings(), "--uses-library "),
+				"libs": android.JoinWithPrefix(staticLibManifests.Strings(), "--libs "),
 			},
 		})
 		manifest = mergedManifest