diff options
author | 2025-02-21 20:46:25 +0000 | |
---|---|---|
committer | 2025-02-25 19:05:07 +0000 | |
commit | 2a815b6d8ea8f29b54f780b1219c28b0c8c977aa (patch) | |
tree | 3637bda1bc41a893d7d0a502798d47c74434cb70 /filesystem/filesystem.go | |
parent | a88b86ff5d86306ec15bc1de7892d17b4154210e (diff) |
Convert the following singletons to use ModuleProxy:
buildTargetSingleton
exportedJavaDeclarationsLibrarySingleton
javaFuzzPackager
kytheExtractAllSingleton
kytheExtractJavaSingleton
kytheExtractRustSingleton
lintSingleton
logtagsSingleton
makeVarsSingleton
ndkAbiDiffSingleton
ndkAbiDumpSingleton
phonySingleton
platformCompatConfigSingleton
sdkSingleton
Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: I625ac8a209ca93755b2ba232202cfb44ecefde0a
Diffstat (limited to 'filesystem/filesystem.go')
-rw-r--r-- | filesystem/filesystem.go | 5 |
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) { |