diff options
author | Joe Baker-Malone <jbakermalone@google.com> | 2023-05-02 13:59:42 -0700 |
---|---|---|
committer | Joe Baker-Malone <jbakermalone@google.com> | 2023-05-04 10:08:57 -0700 |
commit | 741153e06175fbe4c2da2ad2ab8b704d9ab30259 (patch) | |
tree | 5d1f4e8fefa0df82f86b0960eadd3580f4e35f64 | |
parent | fd103af85a566ccc65ca1b0efa4168673c0952cc (diff) | |
download | jarjar-741153e06175fbe4c2da2ad2ab8b704d9ab30259.tar.gz |
Support META-INF and module-infostudio-2024.1.2-canary1studio-2024.1.1-canary8studio-2024.1.1-canary6studio-2024.1.1-beta2studio-2023.3.1-rc2studio-2023.3.1-canary8studio-2023.3.1-canary03studio-2023.3.1studio-2023.2.1-rc1studio-2023.2.1-canary05studio-2023.2.1-beta02studio-2023.2.1
"Classes" in META-INF (like module-info) shouldn't be moved based on
their "package name" (that is, they shouldn't be moved to the root).
"module-info" is now a valid identifier, similar to "package-info".
Test: updated/fixed WildcardTest
Bug: 280496808
Change-Id: I3da204998a3661a9c5beb6697b884a7bc8193392
-rw-r--r-- | src/main/com/tonicsystems/jarjar/Wildcard.java | 4 | ||||
-rw-r--r-- | src/main/com/tonicsystems/jarjar/util/JarTransformer.java | 3 | ||||
-rw-r--r-- | src/test/com/tonicsystems/jarjar/WildcardTest.java | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/main/com/tonicsystems/jarjar/Wildcard.java b/src/main/com/tonicsystems/jarjar/Wildcard.java index c92e0fb..2522e0d 100644 --- a/src/main/com/tonicsystems/jarjar/Wildcard.java +++ b/src/main/com/tonicsystems/jarjar/Wildcard.java @@ -143,6 +143,10 @@ class Wildcard if (expr.endsWith("package-info")) { expr = expr.substring(0, expr.length() - "package-info".length()); } + // Android-changed: also include module-info + if (expr.endsWith("module-info")) { + expr = expr.substring(0, expr.length() - "module-info".length()); + } for (int i = 0, len = expr.length(); i < len; i++) { char c = expr.charAt(i); if (extra.indexOf(c) >= 0) diff --git a/src/main/com/tonicsystems/jarjar/util/JarTransformer.java b/src/main/com/tonicsystems/jarjar/util/JarTransformer.java index 53c7de0..d22f7bd 100644 --- a/src/main/com/tonicsystems/jarjar/util/JarTransformer.java +++ b/src/main/com/tonicsystems/jarjar/util/JarTransformer.java @@ -24,7 +24,8 @@ import org.objectweb.asm.ClassWriter; abstract public class JarTransformer implements JarProcessor { public boolean process(EntryStruct struct) throws IOException { - if (struct.name.endsWith(".class")) { + // Android-changed: exclude META-INF files, so they don't get moved into the root. + if (struct.name.endsWith(".class") && !struct.name.startsWith("META-INF")) { ClassReader reader; try { reader = new ClassReader(struct.data); diff --git a/src/test/com/tonicsystems/jarjar/WildcardTest.java b/src/test/com/tonicsystems/jarjar/WildcardTest.java index 7cdcdf7..f41b2f5 100644 --- a/src/test/com/tonicsystems/jarjar/WildcardTest.java +++ b/src/test/com/tonicsystems/jarjar/WildcardTest.java @@ -30,10 +30,12 @@ extends TestCase wildcard("net/sf/cglib/**", "foo/@1", "net/sf/cglib/!", null); wildcard("net/sf/cglib/*", "foo/@1", "net/sf/cglib/Bar", "foo/Bar"); wildcard("net/sf/cglib/*/*", "foo/@2/@1", "net/sf/cglib/Bar/Baz", "foo/Baz/Bar"); + wildcard("**/package-info", "bar/baz/@1/package-info", "foo/package-info", "bar/baz/foo/package-info"); + wildcard("**/module-info", "bar/baz/@1/module-info", "foo/module-info", "bar/baz/foo/module-info"); } private void wildcard(String pattern, String result, String value, String expect) { - Wildcard wc = new Wildcard(pattern, result); + Wildcard wc = new Wildcard(pattern, result, 0); // System.err.println(wc); assertEquals(expect, wc.replace(value)); } |