Merge "Revert "Revert "Fix manifest merging flags""" (bf1d9eae) · Commits · e / os / android_build_soong

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