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

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

Revert "Fix manifest merging flags" 

This reverts commit b7c147ef.

Reason for revert: broke SystemUI tests
Bug: 112587252
Bug: 112467584

Change-Id: I0d442e40d22ff9b04b1bb618a68a7d04c20e376b
parent b7c147ef

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