From 18994c73f11db00371be747c8dca6da1c01fa2ef Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 28 Feb 2023 16:02:16 -0800 Subject: Replace SortedStringKeys with SortedKeys Now that we have generics. Bug: 193460475 Test: presubmits Change-Id: I1594fd8feb505175d5c09c03ef397e5ffd5b09cb --- java/bootclasspath_fragment.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/bootclasspath_fragment.go') diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 585f81887..c07a94a0b 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -440,7 +440,7 @@ func (i BootclasspathFragmentApexContentInfo) DexBootJarPathForContentModule(mod return dexJar, nil } else { return nil, fmt.Errorf("unknown bootclasspath_fragment content module %s, expected one of %s", - name, strings.Join(android.SortedStringKeys(i.contentModuleDexJarPaths), ", ")) + name, strings.Join(android.SortedKeys(i.contentModuleDexJarPaths), ", ")) } } @@ -709,7 +709,7 @@ func (b *BootclasspathFragmentModule) getImageConfig(ctx android.EarlyModuleCont imageName := *imageNamePtr imageConfig := imageConfigs[imageName] if imageConfig == nil { - ctx.PropertyErrorf("image_name", "Unknown image name %q, expected one of %s", imageName, strings.Join(android.SortedStringKeys(imageConfigs), ", ")) + ctx.PropertyErrorf("image_name", "Unknown image name %q, expected one of %s", imageName, strings.Join(android.SortedKeys(imageConfigs), ", ")) return nil } return imageConfig -- cgit v1.2.3-59-g8ed1b