commit df9553ee1c7af919bf07061c48fc1d252ef569d7
author Clément Béra <clementbera@google.com> Fri Oct 09 06:41:43 2020 +0000
committer Clément Béra <clementbera@google.com> Fri Oct 09 06:45:10 2020 +0000
tree a51422e40af86bbc2a234c095659d77371810c8b
parent 9cfff6364d49f8b73ca1e5e26a4d70c759356f84

Desugared Library: update configuration

Bug: 167649682
Change-Id: I2e59cba939a418f7811f45265830560e1039100c

src/library_desugar/desugar_jdk_libs.json

diff --git a/src/library_desugar/desugar_jdk_libs.json b/src/library_desugar/desugar_jdk_libs.json
index d46b12d..945ad60 100644
--- a/src/library_desugar/desugar_jdk_libs.json
+++ b/src/library_desugar/desugar_jdk_libs.json
@@ -2,7 +2,7 @@
   "configuration_format_version": 3,
   "group_id" : "com.tools.android",
   "artifact_id" : "desugar_jdk_libs",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "required_compilation_api_level": 26,
   "synthesized_library_classes_package_prefix": "j$.",
   "common_flags": [
@@ -246,6 +246,9 @@
     "-keeppackagenames j$",
     "-keepclassmembers class j$.util.IntSummaryStatistics { long count; long sum; int min; int max; }",
     "-keepclassmembers class j$.util.LongSummaryStatistics { long count; long sum; long min; long max; }",
-    "-keepclassmembers class j$.util.DoubleSummaryStatistics { long count; double sum; double min; double max; }"
+    "-keepclassmembers class j$.util.DoubleSummaryStatistics { long count; double sum; double min; double max; }",
+    "-keepattributes Signature",
+    "-keepattributes EnclosingMethod",
+    "-keepattributes InnerClasses"
   ]
 }

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonAllMapsTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonAllMapsTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonAllMapsTest.java
index 7938465..45e6af7 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonAllMapsTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonAllMapsTest.java
@@ -46,7 +46,7 @@
         .addDesugaredCoreLibraryRunClassPath(
             this::buildDesugaredLibrary,
             parameters.getApiLevel(),
-            keepRuleConsumer.get() + GSON_LIBRARY_KEEP_RULES,
+            keepRuleConsumer.get(),
             shrinkDesugaredLibrary)
         .run(parameters.getRuntime(), AllMapsTestClass.class)
         .assertSuccessWithOutputLines(EXPECTED_RESULT);
@@ -69,7 +69,7 @@
         .addDesugaredCoreLibraryRunClassPath(
             this::buildDesugaredLibrary,
             parameters.getApiLevel(),
-            keepRuleConsumer.get() + GSON_LIBRARY_KEEP_RULES,
+            keepRuleConsumer.get(),
             shrinkDesugaredLibrary)
         .run(parameters.getRuntime(), AllMapsTestClass.class)
         .assertSuccessWithOutputLines(EXPECTED_RESULT);

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonDesugaredLibraryTestBase.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonDesugaredLibraryTestBase.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonDesugaredLibraryTestBase.java
index e761248..1904ff7 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonDesugaredLibraryTestBase.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonDesugaredLibraryTestBase.java
@@ -11,10 +11,4 @@
   protected static final Path GSON_CONFIGURATION =
       Paths.get("src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/gson.cfg");
   protected static final Path GSON_2_8_1_JAR = Paths.get("third_party/iosched_2019/gson-2.8.1.jar");
-  // We only need here, for all subclasses of java.util.Collection and java.util.Map,
-  // to keep the signature attribute.
-  protected static final String GSON_LIBRARY_KEEP_RULES =
-      "-keepattributes Signature\n"
-          + "-keepattributes EnclosingMethod\n"
-          + "-keepattributes InnerClasses\n";
 }

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonOptionalTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonOptionalTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonOptionalTest.java
index 6b75eb9..d3fd68a 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonOptionalTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/gson/GsonOptionalTest.java
@@ -41,7 +41,7 @@
         .addDesugaredCoreLibraryRunClassPath(
             this::buildDesugaredLibrary,
             parameters.getApiLevel(),
-            keepRuleConsumer.get() + GSON_LIBRARY_KEEP_RULES,
+            keepRuleConsumer.get(),
             shrinkDesugaredLibrary)
         .run(parameters.getRuntime(), OptionalTestClass.class)
         .assertSuccessWithOutputLines("true", "true");
@@ -65,7 +65,7 @@
         .addDesugaredCoreLibraryRunClassPath(
             this::buildDesugaredLibrary,
             parameters.getApiLevel(),
-            keepRuleConsumer.get() + GSON_LIBRARY_KEEP_RULES,
+            keepRuleConsumer.get(),
             shrinkDesugaredLibrary)
         .run(parameters.getRuntime(), OptionalTestClass.class)
         .assertSuccessWithOutputLines("true", "true");