commit 7909ce943e756ea668a367fd44797b5653d7c1b9
author Søren Gjesse <sgjesse@google.com> Mon Feb 24 12:07:18 2020 +0100
committer Søren Gjesse <sgjesse@google.com> Mon Feb 24 12:07:18 2020 +0100
tree e3e4f6003d92a4d4dcdedc827f2943e52d84cfcb
parent 43d24e66d090c6fd3f29b0eea611701f53d308df

Version 1.6.73

Cherry-pick: Desugared lib: rename test packages
CL: https://r8-review.googlesource.com/c/r8/+/45335
This was not actually cherry-picked, as it moved many tests which do
not exist on the branck. Instead it was partly manually applied by
move NeverMergeCoreLibDesugarClasses.java from .../corelib to
.../desugaredLibrary.

Cherry-pick: Disallow merging classes in the j$ package with classes
             in other packages
CL: https://r8-review.googlesource.com/c/r8/+/46298

Bug: 134705306
Change-Id: I9b95b7e6fbf9cd030001dfa78b6b870f0fc428fc

src/main/java/com/android/tools/r8/Version.java

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 23250fc..7fce0ed 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "1.6.72";
+  public static final String LABEL = "1.6.73";
 
   private Version() {
   }

src/main/java/com/android/tools/r8/utils/InternalOptions.java

diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index d826aa9..3fb0d45 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -179,9 +179,9 @@
 
   // Flag to toggle if DEX code objects should pass-through without IR processing.
   public boolean passthroughDexCode = false;
-  // TODO(b/134705306): Currently allow merging dex files resulting from Java 8 library
-  //  desugaring until all D8 users are complient.
-  public boolean enableNeverMergePrefixes = false;
+
+  // Flag to toggle if the prefix based merge restriction should be enforced.
+  public boolean enableNeverMergePrefixes = true;
   public Set<String> neverMergePrefixes = ImmutableSet.of("j$.");
 
   public boolean libraryInterfacesMayHaveStaticInitialization = false;

src/test/java/com/android/tools/r8/desugar/desugaredLibrary/NeverMergeCoreLibDesugarClasses.java

diff --git a/src/test/java/com/android/tools/r8/desugar/corelib/NeverMergeCoreLibDesugarClasses.java b/src/test/java/com/android/tools/r8/desugar/desugaredLibrary/NeverMergeCoreLibDesugarClasses.java
similarity index 95%
rename from src/test/java/com/android/tools/r8/desugar/corelib/NeverMergeCoreLibDesugarClasses.java
rename to src/test/java/com/android/tools/r8/desugar/desugaredLibrary/NeverMergeCoreLibDesugarClasses.java
index 352fccf..470b653 100644
--- a/src/test/java/com/android/tools/r8/desugar/corelib/NeverMergeCoreLibDesugarClasses.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredLibrary/NeverMergeCoreLibDesugarClasses.java
@@ -46,7 +46,6 @@
           .addInnerClasses(NeverMergeCoreLibDesugarClasses.class)
           .addProgramDexFileData(builder.compile())
           .setMinApi(parameters.getRuntime())
-          .addOptionsModification(options -> options.enableNeverMergePrefixes = true)
           .compileWithExpectedDiagnostics(diagnostics -> {
             diagnostics.assertErrorsCount(1);
             String message = diagnostics.getErrors().get(0).getDiagnosticMessage();
@@ -72,7 +71,6 @@
           .addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.P))
           .setMinApi(parameters.getRuntime())
           .addProgramFiles(buildDesugaredLibrary(parameters.getApiLevel()))
-          .addOptionsModification(options -> options.enableNeverMergePrefixes = true)
           .compileWithExpectedDiagnostics(diagnostics -> {
             diagnostics.assertErrorsCount(1);
             String message = diagnostics.getErrors().get(0).getDiagnosticMessage();