summaryrefslogtreecommitdiff
path: root/filesystem/android_device.go
diff options
context:
space:
mode:
author Yu Liu <yudiliu@google.com> 2025-02-21 20:46:25 +0000
committer Yu Liu <yudiliu@google.com> 2025-02-25 19:05:07 +0000
commit2a815b6d8ea8f29b54f780b1219c28b0c8c977aa (patch)
tree3637bda1bc41a893d7d0a502798d47c74434cb70 /filesystem/android_device.go
parenta88b86ff5d86306ec15bc1de7892d17b4154210e (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/android_device.go')
-rw-r--r--filesystem/android_device.go5
1 files changed, 3 insertions, 2 deletions
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) {