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

Commit b7c147ef authored by Jason Monk's avatar Jason Monk Committed by Colin Cross
Browse files

Fix manifest merging flags 

library manifests were just being dropped on the ground.

Bug: 112467584
Test: build
Change-Id: I61c2efca37aa3fdb9c944260f4a276d1d3c26f6c
parent 4eb44194

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