commit 6d54693bc5725b8d1ce362368b1b1ad87f92e74a
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Jan 18 20:19:33 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 19 08:29:57 2021 +0000
tree e6b5371cd864d391ee140ae4359500bdbab95e5f
parent 45abed954661406eddd14725d0729af5b7d73990

Fix explicit MIN_SDK rule check

Bug: 175201530
Change-Id: I55bee50b1c76e06f47ceee92f1b3b39191b9f709

src/main/java/com/android/tools/r8/shaking/ProguardConfigurationUtils.java

diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationUtils.java b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationUtils.java
index 42b56bd..c6afc11 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationUtils.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationUtils.java
@@ -134,11 +134,15 @@
       if (rule.getClassType() != ProguardClassType.CLASS) {
         continue;
       }
+      if (!rule.getClassAnnotations().isEmpty() || !rule.getInheritanceAnnotations().isEmpty()) {
+        continue;
+      }
       if (rule.hasInheritanceClassName()
           && !rule.getInheritanceClassName().matches(factory.objectType)) {
         continue;
       }
-      if (!rule.getClassNames().matches(factory.androidOsBuildVersionType)) {
+      if (rule.getClassNames().hasWildcards()
+          || !rule.getClassNames().matches(factory.androidOsBuildVersionType)) {
         continue;
       }
       for (ProguardMemberRule memberRule : rule.getMemberRules()) {
@@ -149,6 +153,9 @@
         if (memberRule.getRuleType() != ProguardMemberType.FIELD) {
           continue;
         }
+        if (!memberRule.getAnnotations().isEmpty()) {
+          continue;
+        }
         if (memberRule.getAccessFlags().isProtected()
             || memberRule.getAccessFlags().isPrivate()
             || memberRule.getAccessFlags().isAbstract()