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

Merge "Make init_rc property configurable" into main

Browse Source
This commit is contained in:
Inseob Kim
2024-09-20 08:01:57 +00:00
committed by Gerrit Code Review
parent f771470d8c 713b87da61
commit b33154033a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/module.go
View File

@@ -381,7 +381,7 @@ type commonProperties struct {
Native_bridge_supported *bool `android:"arch_variant"` Native_bridge_supported *bool `android:"arch_variant"`
// init.rc files to be installed if this module is installed // init.rc files to be installed if this module is installed
Init_rc []string `android:"arch_variant,path"` Init_rc proptools.Configurable[[]string] `android:"arch_variant,path"`
// VINTF manifest fragments to be installed if this module is installed // VINTF manifest fragments to be installed if this module is installed
Vintf_fragments proptools.Configurable[[]string] `android:"path"` Vintf_fragments proptools.Configurable[[]string] `android:"path"`
@@ -1855,7 +1855,7 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext)
// so only a single rule is created for each init.rc or vintf fragment file. // so only a single rule is created for each init.rc or vintf fragment file.
if !m.InVendorRamdisk() { if !m.InVendorRamdisk() {
ctx.initRcPaths = PathsForModuleSrc(ctx, m.commonProperties.Init_rc) ctx.initRcPaths = PathsForModuleSrc(ctx, m.commonProperties.Init_rc.GetOrDefault(ctx, nil))
rcDir := PathForModuleInstall(ctx, "etc", "init") rcDir := PathForModuleInstall(ctx, "etc", "init")
for _, src := range ctx.initRcPaths { for _, src := range ctx.initRcPaths {
installedInitRc := rcDir.Join(ctx, src.Base()) installedInitRc := rcDir.Join(ctx, src.Base())