Update ApkSubject to use the AndroidCompiledDataDeserializer for proto apks.

Minor fixes to the AndroidCompiledDataDeserializer

RELNOTES: None
PiperOrigin-RevId: 193535766

1 files changed, 5 insertions, 7 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java b/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java
index 59a6fa3504..a3a6f2f494 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java
@@ -22,6 +22,7 @@ import com.android.resources.ResourceType;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
+import com.google.devtools.build.android.AndroidCompiledDataDeserializer.ReferenceResolver;
 import com.google.devtools.build.android.FullyQualifiedName.Factory;
 import com.google.devtools.build.android.FullyQualifiedName.VirtualType;
 import com.google.devtools.build.android.ParsedAndroidData.KeyValueConsumer;
@@ -45,7 +46,6 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.Objects;
 import javax.xml.stream.FactoryConfigurationError;
 import javax.xml.stream.XMLEventReader;
@@ -173,13 +173,11 @@ public class DataResourceXml implements DataResource {
       Value protoValue,
       DataSource source,
       ResourceType resourceType,
-      Map<String, Boolean> fullyQualifiedNames)
+      ReferenceResolver packageResolver)
       throws InvalidProtocolBufferException {
     DataResourceXml dataResourceXml =
         createWithNamespaces(
-            source,
-            valueFromProto(protoValue, resourceType, fullyQualifiedNames),
-            Namespaces.empty());
+            source, valueFromProto(protoValue, resourceType, packageResolver), Namespaces.empty());
     return dataResourceXml;
   }
 
@@ -211,7 +209,7 @@ public class DataResourceXml implements DataResource {
   }
 
   private static XmlResourceValue valueFromProto(
-      Value proto, ResourceType resourceType, Map<String, Boolean> qualifiedReferenceToInlineStatus)
+      Value proto, ResourceType resourceType, ReferenceResolver packageResolver)
       throws InvalidProtocolBufferException {
     switch (resourceType) {
       case STYLE:
@@ -223,7 +221,7 @@ public class DataResourceXml implements DataResource {
       case ATTR:
         return AttrXmlResourceValue.from(proto);
       case STYLEABLE:
-        return StyleableXmlResourceValue.from(proto, qualifiedReferenceToInlineStatus);
+        return StyleableXmlResourceValue.from(proto, packageResolver);
       case ID:
         return IdXmlResourceValue.of();
       case DIMEN: