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

Commit f37d153b authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix manifest merging flags""

parents 116901a7 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(), "--libs "),

				"libs": android.JoinWithPrefix(staticLibManifests.Strings(), "--uses-library "),

			},

		})

		manifest = mergedManifest