commit cc8127afa2e852e05b6acd1a29ccc3141f944205
author Christoffer Adamsen <christofferqa@google.com> Tue Feb 25 07:58:33 2025 +0100
committer Christoffer Adamsen <christofferqa@google.com> Mon Feb 24 22:59:34 2025 -0800
tree 1383373dcf0e44e12e426f4bf21dfdea92107611
parent 231bc2225f6a37817df880bc51e6a0d7204aed3a

Report origin of keep rule files that retain invisible annotations

This is only enabled when the system property com.android.tools.r8.enableKeepRuntimeInvisibleAnnotations is set to false.

Bug: b/387958004
Change-Id: I93491d41e3eba9ab5304552733f153dde7d045b4

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

diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
index bacebd7..78cec87 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
@@ -277,7 +277,8 @@
 
       // Collect the parsed configuration.
       configurationBuilder.addParsedConfiguration(contents.substring(positionAfterInclude));
-      configurationBuilder.addParsedConfiguration("# End of content from " + origin.toString());
+      configurationBuilder.addParsedConfiguration("# End of content from " + origin);
+      reporter.failIfPendingErrors();
     }
 
     private boolean parseOption() throws ProguardRuleParserException {
@@ -763,6 +764,19 @@
       if (attributesPatterns.isEmpty()) {
         throw parseError("Expected attribute pattern list");
       }
+      if (!options.isKeepRuntimeInvisibleAnnotationsEnabled()) {
+        ProguardKeepAttributes keepAttributes =
+            ProguardKeepAttributes.fromPatterns(attributesPatterns);
+        if (keepAttributes.runtimeInvisibleAnnotations
+            || keepAttributes.runtimeInvisibleParameterAnnotations
+            || keepAttributes.runtimeInvisibleTypeAnnotations) {
+          reporter.error(
+              new StringDiagnostic(
+                  "Illegal attempt to keep runtime invisible annotations (origin: "
+                      + origin
+                      + ")"));
+        }
+      }
       configurationBuilder.addKeepAttributePatterns(attributesPatterns);
     }