diff options
| author | 2024-09-20 08:01:57 +0000 | |
|---|---|---|
| committer | 2024-09-20 08:01:57 +0000 | |
| commit | b33154033a3011bb3aaa639de86ceb51aef09c6a (patch) | |
| tree | ed50d05c1a72ee00deadf8d03b1437ca2f6217e0 /android/module.go | |
| parent | f771470d8cdd40e2fa788a722bd6541fbefc0538 (diff) | |
| parent | 713b87da615363e7c6a1d0c7eb553cd0cea7374a (diff) | |
Merge "Make init_rc property configurable" into main
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/module.go b/android/module.go index 1a3f328eb..e2b7e119a 100644 --- a/android/module.go +++ b/android/module.go @@ -381,7 +381,7 @@ type commonProperties struct { Native_bridge_supported *bool `android:"arch_variant"` // 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_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. 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") for _, src := range ctx.initRcPaths { installedInitRc := rcDir.Join(ctx, src.Base()) |