Merge "Add symlinks support for prebuilt_etc modules" am: cb240bc9c1

Change-Id: Id69bc8b2fcaf0b9c2c48919054256eefcf7a7e31
This commit is contained in:
Yo Chiang 2020-05-29 13:40:05 +00:00 committed by Automerger Merge Worker
commit 6a63341a93

View file

@ -49,6 +49,9 @@ type prebuiltEtcProperties struct {
// Whether this module is directly installable to one of the partitions. Default: true.
Installable *bool
// Install symlinks to the installed file.
Symlinks []string `android:"arch_variant"`
}
type PrebuiltEtcModule interface {
@ -201,10 +204,13 @@ func (p *PrebuiltEtc) AndroidMkEntries() []AndroidMkEntries {
entries.SetString("LOCAL_MODULE_TAGS", "optional")
entries.SetString("LOCAL_MODULE_PATH", p.installDirPath.ToMakePath().String())
entries.SetString("LOCAL_INSTALLED_MODULE_STEM", p.outputFilePath.Base())
if len(p.properties.Symlinks) > 0 {
entries.AddStrings("LOCAL_MODULE_SYMLINKS", p.properties.Symlinks...)
}
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())
entries.AddStrings("LOCAL_ADDITIONAL_DEPENDENCIES", path.String())
}
}
},