AndroidMkEntries() returns multiple AndroidMkEntries structs
AndroidMkEntries now returns multiple AndroidMkEntires so that a module
can emit multiple Make modules if needed.
Bug: 128708192
Test: m
Change-Id: I56b6f76d22943b80329951c5acb80a1b932441ad
diff --git a/cc/vndk.go b/cc/vndk.go
index 5aeb2e6..f531af3 100644
--- a/cc/vndk.go
+++ b/cc/vndk.go
@@ -460,8 +460,8 @@
ctx.InstallFile(installPath, filename, txt.outputFile)
}
-func (txt *vndkLibrariesTxt) AndroidMkEntries() android.AndroidMkEntries {
- return android.AndroidMkEntries{
+func (txt *vndkLibrariesTxt) AndroidMkEntries() []android.AndroidMkEntries {
+ return []android.AndroidMkEntries{android.AndroidMkEntries{
Class: "ETC",
OutputFile: android.OptionalPathForPath(txt.outputFile),
ExtraEntries: []android.AndroidMkExtraEntriesFunc{
@@ -469,7 +469,7 @@
entries.SetString("LOCAL_MODULE_STEM", txt.outputFile.Base())
},
},
- }
+ }}
}
func (txt *vndkLibrariesTxt) OutputFile() android.OutputPath {