diff options
Diffstat (limited to 'android/prebuilt_etc.go')
| -rw-r--r-- | android/prebuilt_etc.go | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/android/prebuilt_etc.go b/android/prebuilt_etc.go index bec24c77..f35e3c76 100644 --- a/android/prebuilt_etc.go +++ b/android/prebuilt_etc.go @@ -140,16 +140,18 @@ func (p *PrebuiltEtc) AndroidMkEntries() AndroidMkEntries { Class: "ETC", SubName: nameSuffix, OutputFile: OptionalPathForPath(p.outputFilePath), - AddCustomEntries: func(name, prefix, moduleDir string, entries *AndroidMkEntries) { - entries.SetString("LOCAL_MODULE_TAGS", "optional") - entries.SetString("LOCAL_MODULE_PATH", "$(OUT_DIR)/"+p.installDirPath.RelPathString()) - entries.SetString("LOCAL_INSTALLED_MODULE_STEM", p.outputFilePath.Base()) - entries.SetString("LOCAL_UNINSTALLABLE_MODULE", strconv.FormatBool(!p.Installable())) - if p.additionalDependencies != nil { - for _, path := range *p.additionalDependencies { - entries.SetString("LOCAL_ADDITIONAL_DEPENDENCIES", path.String()) + ExtraEntries: []AndroidMkExtraEntriesFunc{ + func(entries *AndroidMkEntries) { + entries.SetString("LOCAL_MODULE_TAGS", "optional") + entries.SetString("LOCAL_MODULE_PATH", "$(OUT_DIR)/"+p.installDirPath.RelPathString()) + entries.SetString("LOCAL_INSTALLED_MODULE_STEM", p.outputFilePath.Base()) + entries.SetString("LOCAL_UNINSTALLABLE_MODULE", strconv.FormatBool(!p.Installable())) + if p.additionalDependencies != nil { + for _, path := range *p.additionalDependencies { + entries.SetString("LOCAL_ADDITIONAL_DEPENDENCIES", path.String()) + } } - } + }, }, } } |