summaryrefslogtreecommitdiff
path: root/filesystem/filesystem.go
diff options
context:
space:
mode:
author Yu Liu <yudiliu@google.com> 2025-02-25 12:55:33 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-02-25 12:55:33 -0800
commitd272a622e908736b01bf731dc653aadc47c64971 (patch)
tree35ddbe0592ca3f0a703c2d39b8747729590e809d /filesystem/filesystem.go
parent89dab88cc55d9ab0ff85d0a30780ad182cdaf214 (diff)
parent2a815b6d8ea8f29b54f780b1219c28b0c8c977aa (diff)
Merge "Convert the following singletons to use ModuleProxy:" into main
Diffstat (limited to 'filesystem/filesystem.go')
-rw-r--r--filesystem/filesystem.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go
index 28eb36d1e..d4ea6a34c 100644
--- a/filesystem/filesystem.go
+++ b/filesystem/filesystem.go
@@ -1525,10 +1525,11 @@ func addAutogeneratedRroDeps(ctx android.BottomUpMutatorContext) {
})
}
-func (f *filesystem) MakeVars(ctx android.MakeVarsModuleContext) {
+func (f *filesystem) MakeVars(ctx android.MakeVarsModuleContext) []android.ModuleMakeVarsValue {
if f.Name() == ctx.Config().SoongDefinedSystemImage() {
- ctx.StrictRaw("SOONG_DEFINED_SYSTEM_IMAGE_PATH", f.output.String())
+ return []android.ModuleMakeVarsValue{{"SOONG_DEFINED_SYSTEM_IMAGE_PATH", f.output.String()}}
}
+ return nil
}
func setCommonFilesystemInfo(ctx android.ModuleContext, m Filesystem) {