| commit | 2b8dcf8253f2d62558e3beef82fdf839f1933b04 | [log] [tgz] |
|---|---|---|
| author | Christoffer Quist Adamsen <christofferqa@google.com> | Mon Feb 18 12:26:13 2019 +0100 |
| committer | Christoffer Quist Adamsen <christofferqa@google.com> | Mon Feb 18 12:26:13 2019 +0100 |
| tree | d1d0a856246f32028ca4c85ab2e73d7b416f7200 | |
| parent | 31b86ffa799fb1d339e97880548302e3659c4f1c [diff] |
Only interpret pattern as include-all if separators are also included Bug: 124584385 Change-Id: I94496d9ddca5ce276773bfe24fac6db92b811495
diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardTypeMatcher.java b/src/main/java/com/android/tools/r8/shaking/ProguardTypeMatcher.java index a59a08c..996f83f 100644 --- a/src/main/java/com/android/tools/r8/shaking/ProguardTypeMatcher.java +++ b/src/main/java/com/android/tools/r8/shaking/ProguardTypeMatcher.java
@@ -388,7 +388,8 @@ wildcardPattern = wildcard.asPattern(); boolean includeSeparators = pattern.length() > (i + 1) && pattern.charAt(i + 1) == '*'; - boolean includeAll = pattern.length() > (i + 2) && pattern.charAt(i + 2) == '*'; + boolean includeAll = + includeSeparators && pattern.length() > (i + 2) && pattern.charAt(i + 2) == '*'; int nextPatternIndex = i + 1; if (includeAll) { nextPatternIndex += 2;