commit 0205ec0e50cc14e0228f3d3882f0b7acde88d7ea
author Ian Zerny <zerny@google.com> Wed Feb 12 09:08:02 2020 +0100
committer Ian Zerny <zerny@google.com> Wed Feb 12 10:07:58 2020 +0000
tree d40a990a6ba1fcd8a309b5952dfda90825a6a3e0
parent 08ef6ffa1aa7873c26e155d519cae1e45349986c

Allow lookup of missing proto builder types.

Bug: 149363884
Bug: 149361137
Change-Id: I3580218b85051ff7e7a1c2e36b786bf0c72f6025

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

diff --git a/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java b/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java
index 85db7d1..952c1dd 100644
--- a/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java
+++ b/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java
@@ -524,7 +524,11 @@
   @Override
   public DexClass definitionFor(DexType type) {
     DexClass definition = super.definitionFor(type);
-    assert dontAssertDefinitionFor || definition != null || missingTypes.contains(type)
+    assert dontAssertDefinitionFor
+        || definition != null
+        || missingTypes.contains(type)
+        // TODO(b/149363884): Remove this exception once fixed.
+        || type.toDescriptorString().endsWith("$Builder;")
         : "Failed lookup of non-missing type: " + type;
     return definition;
   }