From 6f937a99e312841401751244c528d7e23036280f Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Thu, 9 Aug 2018 21:47:37 -0400
Subject: [PATCH] Fix manifest merging flags

library manifests were just being dropped on the ground.

Bug: 112467584
Test: build
Change-Id: I61c2efca37aa3fdb9c944260f4a276d1d3c26f6c
Merged-In: I61c2efca37aa3fdb9c944260f4a276d1d3c26f6c
(cherry picked from commit b7c147efec90707532f97b6cc7ff9e82095772fc)
---
 java/android_manifest.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/android_manifest.go b/java/android_manifest.go
index 77b6214e1..657747520 100644
--- a/java/android_manifest.go
+++ b/java/android_manifest.go
@@ -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