Automated rollback of commit 70c2be189c9c0021f7c424c7399f8bdecc579b4e.

*** Reason for rollback ***

Broke some cakemix tap projects

*** Original change description ***

Use assets from the APK for resource shrinking rather than from the merge actions.

RELNOTES: none
PiperOrigin-RevId: 179252805

3 files changed, 8 insertions, 11 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/PluralXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/PluralXmlResourceValue.java
index b912cc141e..6e1fba18c7 100644
--- a/src/tools/android/java/com/google/devtools/build/android/xml/PluralXmlResourceValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/xml/PluralXmlResourceValue.java
@@ -17,7 +17,6 @@ import com.android.aapt.Resources.Plural;
 import com.android.aapt.Resources.Value;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.xml.XmlEscapers;
 import com.google.devtools.build.android.AndroidDataWritingVisitor;
 import com.google.devtools.build.android.AndroidDataWritingVisitor.ValuesResourceDefinition;
 import com.google.devtools.build.android.AndroidResourceSymbolSink;
@@ -144,10 +143,13 @@ public class PluralXmlResourceValue implements XmlResourceValue {
     for (Plural.Entry entry : plural.getEntryList()) {
       String name = entry.getArity().toString().toLowerCase();
       String value =
-          XmlEscapers.xmlContentEscaper().escape(
-              entry.getItem()
-                  .getStr()
-                  .getValue());
+          entry
+              .getItem()
+              .getStr()
+              .toString()
+              .replace("value: \"", "")
+              .replace("\"", "")
+              .replace('\n', ' ');
       items.put(name, value);
     }
 
diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/SimpleXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/SimpleXmlResourceValue.java
index 9b9285621a..4006d4d7a4 100644
--- a/src/tools/android/java/com/google/devtools/build/android/xml/SimpleXmlResourceValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/xml/SimpleXmlResourceValue.java
@@ -20,7 +20,6 @@ import com.android.aapt.Resources.Value;
 import com.android.resources.ResourceType;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.xml.XmlEscapers;
 import com.google.devtools.build.android.AndroidDataWritingVisitor;
 import com.google.devtools.build.android.AndroidDataWritingVisitor.StartTag;
 import com.google.devtools.build.android.AndroidResourceSymbolSink;
@@ -237,7 +236,7 @@ public class SimpleXmlResourceValue implements XmlResourceValue {
     String stringValue = null;
 
     if (item.hasStr()) {
-      stringValue = XmlEscapers.xmlContentEscaper().escape(item.getStr().getValue());
+      stringValue = item.getStr().toString();
     } else if (item.hasRef()) {
       stringValue = "@" + item.getRef().getName();
     } else if (item.hasStyledStr()) {
diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/StyleXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/StyleXmlResourceValue.java
index 0f6369d68b..55c3d00fdd 100644
--- a/src/tools/android/java/com/google/devtools/build/android/xml/StyleXmlResourceValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/xml/StyleXmlResourceValue.java
@@ -86,10 +86,6 @@ public class StyleXmlResourceValue implements XmlResourceValue {
 
     if (style.hasParent()) {
       parent = proto.getCompoundValue().getStyle().getParent().getName();
-      if (parent.startsWith("style/")) {
-        //Aapt2 compile breaks when style parent references are prepended with 'style/'
-        parent = parent.substring(6);
-      }
     }
 
     Map<String, String> items = itemMapFromProto(style);