Remove SortedStringKeys
We have SortedKeys instead now.
Test: Presubmits
Change-Id: I27b38c63cdd770d6bef70e08ae38fdddc066c0f8
diff --git a/android/plugin.go b/android/plugin.go
index d62fc94..4348f14 100644
--- a/android/plugin.go
+++ b/android/plugin.go
@@ -135,6 +135,6 @@
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 8591cc6..7b305b5 100644
--- a/android/util.go
+++ b/android/util.go
@@ -102,13 +102,6 @@
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 47c4e3d..4ee5681 100644
--- a/filesystem/android_device.go
+++ b/filesystem/android_device.go
@@ -351,7 +351,7 @@
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)},