summaryrefslogtreecommitdiff
path: root/filesystem/android_device.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/android_device.go
parent89dab88cc55d9ab0ff85d0a30780ad182cdaf214 (diff)
parent2a815b6d8ea8f29b54f780b1219c28b0c8c977aa (diff)
Merge "Convert the following singletons to use ModuleProxy:" into main
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) {