From 2a815b6d8ea8f29b54f780b1219c28b0c8c977aa Mon Sep 17 00:00:00 2001
From: Yu Liu <yudiliu@google.com>
Date: Fri, 21 Feb 2025 20:46:25 +0000
Subject: 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
---
 filesystem/android_device.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'filesystem/android_device.go')

diff --git a/filesystem/android_device.go b/filesystem/android_device.go
index fef4aeb43..178c716d4 100644
--- a/filesystem/android_device.go
+++ b/filesystem/android_device.go
@@ -325,10 +325,11 @@ func (a *androidDevice) distFiles(ctx android.ModuleContext) {
 	}
 }
 
-func (a *androidDevice) MakeVars(ctx android.MakeVarsModuleContext) {
+func (a *androidDevice) MakeVars(_ android.MakeVarsModuleContext) []android.ModuleMakeVarsValue {
 	if proptools.Bool(a.deviceProps.Main_device) {
-		ctx.StrictRaw("SOONG_ONLY_ALL_IMAGES_ZIP", a.allImagesZip.String())
+		return []android.ModuleMakeVarsValue{{"SOONG_ONLY_ALL_IMAGES_ZIP", a.allImagesZip.String()}}
 	}
+	return nil
 }
 
 func (a *androidDevice) buildProguardZips(ctx android.ModuleContext, allInstalledModules []android.Module) {
-- 
cgit v1.2.3-59-g8ed1b