From 713b87da615363e7c6a1d0c7eb553cd0cea7374a Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Fri, 13 Sep 2024 11:29:54 +0900 Subject: [PATCH] Make init_rc property configurable Bug: 331320802 Test: build Change-Id: Id9c85f2f80381febf360fe320ee43017ec9948b1 --- android/module.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/module.go b/android/module.go index 491c295fb..23bf38eca 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"` @@ -1861,7 +1861,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())