Automated rollback of commit e8bed799d59526541afa2a0e9ef5d4c49e3ba390.

*** Reason for rollback ***

Rolling forward with improved handling and testing for Styleables, and correct package management.

*** Original change description ***

Automated rollback of commit a76f7db51a90cc2e35c1d66782056c310729eef0.

*** Reason for rollback ***

Breaks Kix.

*** Original change description ***

Modify the .flat decompilation to account for multiple configurations by converting the aapt2 proto ConfigValue to a FolderConfiguration.
Adds new aapt2 compiled deserialization test.

RELNOTES: None
PiperOrigin-RevId: 191444658

1 files changed, 2 insertions, 1 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/PlaceholderIdFieldInitializerBuilder.java b/src/tools/android/java/com/google/devtools/build/android/PlaceholderIdFieldInitializerBuilder.java
index 12b7abe4ae..ab1dee800d 100644
--- a/src/tools/android/java/com/google/devtools/build/android/PlaceholderIdFieldInitializerBuilder.java
+++ b/src/tools/android/java/com/google/devtools/build/android/PlaceholderIdFieldInitializerBuilder.java
@@ -165,6 +165,7 @@ class PlaceholderIdFieldInitializerBuilder {
 
   private static String normalizeAttrName(String attrName) {
     // In addition to ".", attributes can have ":", e.g., for "android:textColor".
+    Preconditions.checkArgument(!attrName.contains("::"), "invalid name %s", attrName);
     return normalizeName(attrName).replace(':', '_');
   }
 
@@ -240,7 +241,7 @@ class PlaceholderIdFieldInitializerBuilder {
       styleableAttrs.put(normalizedStyleableName, normalizedAttrs);
     }
     for (Map.Entry<FullyQualifiedName, Boolean> attrEntry : attrs.entrySet()) {
-      String normalizedAttrName = normalizeAttrName(attrEntry.getKey().name());
+      String normalizedAttrName = normalizeAttrName(attrEntry.getKey().qualifiedName());
       normalizedAttrs.put(normalizedAttrName, attrEntry.getValue());
     }
   }