Tolerate dangling references to attributes during resource compilation,
since "inlining" is a no-op anyway.
RELNOTES: None
PiperOrigin-RevId: 248065051
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java
index 6abf81a..f8ae1d8 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java
@@ -13,7 +13,6 @@
// limitations under the License.
package com.google.devtools.build.android;
-import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Predicates.not;
import static java.util.stream.Collectors.toList;
@@ -371,14 +370,12 @@
/** Indicates if a reference can be inlined in a styleable. */
public boolean shouldInline(FullyQualifiedName reference) {
- return checkNotNull(
- qualifiedReferenceInlineStatus.get(reference),
- "%s reference is unsatisfied. Available names: %s",
- reference,
- qualifiedReferenceInlineStatus.keySet())
- .equals(InlineStatus.INLINEABLE)
- // Only inline if it's in the current package.
- && reference.isInPackage(packageName.orElse(FullyQualifiedName.DEFAULT_PACKAGE));
+ // Only inline if it's in the current package.
+ if (!reference.isInPackage(packageName.orElse(FullyQualifiedName.DEFAULT_PACKAGE))) {
+ return false;
+ }
+
+ return InlineStatus.INLINEABLE.equals(qualifiedReferenceInlineStatus.get(reference));
}
/** Update the reference's inline state. */
