Allow some duplicates in merged jars
Only take the first MANIFEST.MF or module-info.class file.
Test: m -j checkbuild
Change-Id: Ifbf9fe272437ef2c2bd51ab4849ac8d7ef37b6fc
diff --git a/jar/jar.go b/jar/jar.go
index d8f063c..5960bf0 100644
--- a/jar/jar.go
+++ b/jar/jar.go
@@ -19,6 +19,12 @@
"strings"
)
+const (
+ MetaDir = "META-INF/"
+ ManifestFile = MetaDir + "MANIFEST.MF"
+ ModuleInfoClass = "module-info.class"
+)
+
// EntryNamesLess tells whether <filepathA> should precede <filepathB> in
// the order of files with a .jar
func EntryNamesLess(filepathA string, filepathB string) (less bool) {
@@ -39,9 +45,9 @@
}
var jarOrder = []string{
- "META-INF/",
- "META-INF/MANIFEST.MF",
- "META-INF/*",
+ MetaDir,
+ ManifestFile,
+ MetaDir + "*",
"*",
}