StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Id69bc8b2fcaf0b9c2c48919054256eefcf7a7e31
This commit is contained in:
Yo Chiang
2020-05-29 13:40:05 +00:00
committed by Automerger Merge Worker
parent d996ff6a68 cb240bc9c1
commit 6a63341a93
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/prebuilt_etc.go
View File

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