diff options
| -rw-r--r-- | android/plugin.go | 2 | ||||
| -rw-r--r-- | android/util.go | 7 | ||||
| -rw-r--r-- | filesystem/android_device.go | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/android/plugin.go b/android/plugin.go index d62fc9453..4348f1475 100644 --- a/android/plugin.go +++ b/android/plugin.go @@ -135,6 +135,6 @@ func (p *pluginSingleton) GenerateBuildActions(ctx SingletonContext) { disallowedPlugins[name] = true }) if len(disallowedPlugins) > 0 { - ctx.Errorf("New plugins are not supported; however %q were found. Please reach out to the build team or use BUILD_BROKEN_PLUGIN_VALIDATION (see Changes.md for more info).", SortedStringKeys(disallowedPlugins)) + ctx.Errorf("New plugins are not supported; however %q were found. Please reach out to the build team or use BUILD_BROKEN_PLUGIN_VALIDATION (see Changes.md for more info).", SortedKeys(disallowedPlugins)) } } diff --git a/android/util.go b/android/util.go index 8591cc63e..7b305b575 100644 --- a/android/util.go +++ b/android/util.go @@ -102,13 +102,6 @@ func JoinWithPrefixSuffixAndSeparator(strs []string, prefix, suffix, sep string) return buf.String() } -// SortedStringKeys returns the keys of the given map in the ascending order. -// -// Deprecated: Use SortedKeys instead. -func SortedStringKeys[V any](m map[string]V) []string { - return SortedKeys(m) -} - // SortedKeys returns the keys of the given map in the ascending order. func SortedKeys[T cmp.Ordered, V any](m map[T]V) []T { if len(m) == 0 { diff --git a/filesystem/android_device.go b/filesystem/android_device.go index 47c4e3d0c..4ee5681dc 100644 --- a/filesystem/android_device.go +++ b/filesystem/android_device.go @@ -351,7 +351,7 @@ func (a *androidDevice) buildTargetFilesZip(ctx android.ModuleContext) { if a.partitionProps.Super_partition_name != nil { superPartition := ctx.GetDirectDepProxyWithTag(*a.partitionProps.Super_partition_name, superPartitionDepTag) if info, ok := android.OtherModuleProvider(ctx, superPartition, SuperImageProvider); ok { - for _, partition := range android.SortedStringKeys(info.SubImageInfo) { + for _, partition := range android.SortedKeys(info.SubImageInfo) { filesystemsToCopy = append( filesystemsToCopy, targetFilesystemZipCopy{info.SubImageInfo[partition], strings.ToUpper(partition)}, |