Transform empty member pattern to pattern that matches default init

Bug: b/323136645
Change-Id: I18b8ea87ba05debaba6b7d9131064d7b315d9f13

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

diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParserOptions.java b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParserOptions.java
index acdd37c..a584eb4 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParserOptions.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParserOptions.java
@@ -72,9 +72,10 @@
               "com.android.tools.r8.experimental.enablewhyareyounotinlining", false);
       enableTestingOptions =
           parseSystemPropertyOrDefault("com.android.tools.r8.allowTestProguardOptions", false);
+      // TODO(b/323136645): This should default to false.
       forceEnableEmptyMemberRulesToDefaultInitRuleConversion =
           parseSystemPropertyOrDefault(
-              "com.android.tools.r8.enableEmptyMemberRulesToDefaultInitRuleConversion", false);
+              "com.android.tools.r8.enableEmptyMemberRulesToDefaultInitRuleConversion", true);
       return this;
     }
 

src/test/java/com/android/tools/r8/compatproguard/CompatKeepClassMemberNamesTestRunner.java

diff --git a/src/test/java/com/android/tools/r8/compatproguard/CompatKeepClassMemberNamesTestRunner.java b/src/test/java/com/android/tools/r8/compatproguard/CompatKeepClassMemberNamesTestRunner.java
index bb999d8..1bd723a 100644
--- a/src/test/java/com/android/tools/r8/compatproguard/CompatKeepClassMemberNamesTestRunner.java
+++ b/src/test/java/com/android/tools/r8/compatproguard/CompatKeepClassMemberNamesTestRunner.java
@@ -333,8 +333,7 @@
 
   @Test
   public void testWithMembersStarRuleFullR8() throws Exception {
-    testWithMembersStarRule(
-        testForR8(parameters.getBackend()).allowUnusedProguardConfigurationRules());
+    testWithMembersStarRule(testForR8(parameters.getBackend()));
   }
 
   // Tests for "-keepclassmembernames" and *no* minification.

src/test/java/com/android/tools/r8/shaking/ifrule/ConditionalKeepIfKeptTest.java

diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/ConditionalKeepIfKeptTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/ConditionalKeepIfKeptTest.java
index 96aa8fd..ab71079 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/ConditionalKeepIfKeptTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/ConditionalKeepIfKeptTest.java
@@ -62,7 +62,7 @@
               ClassSubject classSubject = inspector.clazz(StaticallyReferenced.class);
               assertThat(classSubject, isPresent());
               assertEquals(0, classSubject.allFields().size());
-              assertEquals(0, classSubject.allMethods().size());
+              assertEquals(1, classSubject.allMethods().size());
             });
   }