Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db522fc7 authored by Colin Cross's avatar Colin Cross
Browse files

Revert "Revert "Fix manifest merging flags"" 

This reverts commit b0c795d7.

Reason for revert: SystemUITests fixed in b/112587252
Bug: 112587252
Bug: 112467584

Change-Id: Ie00c1923cb5f17c76ce6ff0528b1f729fdabc4f2
parent b0c795d7

java/android_manifest.go

+1 −1
Original line number Diff line number Diff line
@@ -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