commit 6f937a99e312841401751244c528d7e23036280f
author Jason Monk <jmonk@google.com> Thu Aug 09 21:47:37 2018 -0400
committer Colin Cross <ccross@android.com> Tue Aug 28 14:10:03 2018 -0700
tree b6ca8ed0fdeb326dc45afd2e5b6026bbb72e5fb9
parent 4b42edbca0d68c7d332458bda7656f0b9370ea74

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

diff --git a/java/android_manifest.go b/java/android_manifest.go
index 77b6214..6577475 100644
--- a/java/android_manifest.go
+++ b/java/android_manifest.go
@@ -68,7 +68,7 @@
 			Implicits: staticLibManifests,
 			Output:    mergedManifest,
 			Args: map[string]string{
-				"libs": android.JoinWithPrefix(staticLibManifests.Strings(), "--uses-library "),
+				"libs": android.JoinWithPrefix(staticLibManifests.Strings(), "--libs "),
 			},
 		})
 		manifest = mergedManifest