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 b7c147efec
)
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user