commit 6cb65a7915fb172b16d5d111325e72d6343e2d32
author Ian Zerny <zerny@google.com> Wed Oct 30 13:30:55 2019 +0100
committer Ian Zerny <zerny@google.com> Thu Oct 31 11:56:09 2019 +0000
tree 9dca36828f1831632f1786a21676fa921bd04525
parent ed531d431e6ee9cec5f96d2e9708c44a05e577c0

Don't run the outliner when compiling to classfiles.

Bug: 143550696
Change-Id: I989a1d8430d563495118533d39fc6b94bed1d6f4

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

diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java
index f4b3763..6a65f79 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -859,6 +859,13 @@
       internal.assertionProcessing = AssertionProcessing.LEAVE;
     }
 
+    // When generating class files the build is "intermediate" and we cannot pollute the namespace
+    // with the a hard-coded outline class. Doing so would prohibit subsequent merging of two
+    // R8 produced libraries.
+    if (internal.isGeneratingClassFiles()) {
+      internal.outline.enabled = false;
+    }
+
     // EXPERIMENTAL flags.
     assert !internal.forceProguardCompatibility;
     internal.forceProguardCompatibility = forceProguardCompatibility;