Record whether the attr is defined or referenced in the styleable. Despite the functional equality, the definition type of the attribute has direct impact on the order in which the attribute appears in the styleable array.

--
MOS_MIGRATED_REVID=126126122

1 files changed, 6 insertions, 5 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java b/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
index d554861e3f..eeebbbcfab 100644
--- a/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
+++ b/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
@@ -422,13 +422,14 @@ public class FullyQualifiedName implements DataKey, Comparable<FullyQualifiedNam
 
   @Override
   public void serializeTo(OutputStream out, int valueSize) throws IOException {
-    SerializeFormat.DataKey.newBuilder()
+    toSerializedBuilder().setValueSize(valueSize).build().writeDelimitedTo(out);
+  }
+
+  public SerializeFormat.DataKey.Builder toSerializedBuilder() {
+    return SerializeFormat.DataKey.newBuilder()
         .setKeyPackage(pkg)
-        .setValueSize(valueSize)
         .setResourceType(resourceType.getName().toUpperCase())
         .addAllQualifiers(qualifiers)
-        .setKeyValue(resourceName)
-        .build()
-        .writeDelimitedTo(out);
+        .setKeyValue(resourceName);
   }
 }