Extract jar-sorting to be accessible to soong_zip
Bug: 64536066
Test: m -j # which runs unit tests
Change-Id: I4830bd331c9dab0b1d300a18aefaf25a6af4cfdc
diff --git a/cmd/zip2zip/zip2zip.go b/cmd/zip2zip/zip2zip.go
index 815059c..f48d458 100644
--- a/cmd/zip2zip/zip2zip.go
+++ b/cmd/zip2zip/zip2zip.go
@@ -24,6 +24,7 @@
"strings"
"time"
+ "android/soong/jar"
"android/soong/third_party/zip"
)
@@ -178,37 +179,7 @@
}
func jarSort(files []pair) {
- // Treats trailing * as a prefix match
- match := func(pattern, name string) bool {
- if strings.HasSuffix(pattern, "*") {
- return strings.HasPrefix(name, strings.TrimSuffix(pattern, "*"))
- } else {
- return name == pattern
- }
- }
-
- var jarOrder = []string{
- "META-INF/",
- "META-INF/MANIFEST.MF",
- "META-INF/*",
- "*",
- }
-
- index := func(name string) int {
- for i, pattern := range jarOrder {
- if match(pattern, name) {
- return i
- }
- }
- panic(fmt.Errorf("file %q did not match any pattern", name))
- }
-
sort.SliceStable(files, func(i, j int) bool {
- diff := index(files[i].newName) - index(files[j].newName)
- if diff == 0 {
- return files[i].newName < files[j].newName
- } else {
- return diff < 0
- }
+ return jar.EntryNamesLess(files[i].newName, files[j].newName)
})
}