Create merge action and data deserializer for aapt2 compiled resources.

RELNOTES: None
PiperOrigin-RevId: 175858467

1 files changed, 4 insertions, 2 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/DependencyAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/DependencyAndroidData.java
index d2c72cd644..f59267d23e 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DependencyAndroidData.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DependencyAndroidData.java
@@ -38,7 +38,7 @@ class DependencyAndroidData extends SerializedAndroidData {
   private static final Pattern VALID_REGEX = Pattern.compile(".*:.*:.+:.+(:.*){0,2}");
 
   public static final String EXPECTED_FORMAT =
-      "resources[#resources]:assets[#assets]:manifest:r.txt:static.library.ap_:symbols.bin";
+      "resources[#resources]:assets[#assets]:manifest:r.txt(:symbols.zip?):symbols.bin";
 
   public static DependencyAndroidData valueOf(String text) {
     return valueOf(text, FileSystems.getDefault());
@@ -61,7 +61,9 @@ class DependencyAndroidData extends SerializedAndroidData {
     if (parts.length == 6) { // contains symbols bin and compiled symbols
       compiledSymbols = CompiledResources.from(exists(fileSystem.getPath(parts[4])));
       symbolsBin = exists(fileSystem.getPath(parts[5]));
-    } else if (parts.length == 5) { // contains symbols bin
+    } else if (parts.length == 5) {
+      //This is either symbols bin or compiled symbols depending on "useCompiledResourcesForMerge"
+      compiledSymbols = CompiledResources.from(exists(fileSystem.getPath(parts[4])));
       symbolsBin = exists(fileSystem.getPath(parts[4]));
     }