Expand databinding expressions in resource_files.zip.

This zip is the input to the resource shrinker, which currently sometimes chokes on databinding expressions. This should fix that.

RELNOTES: None
PiperOrigin-RevId: 187049578

1 files changed, 23 insertions, 22 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
index 40d65996f0..12c7d7090b 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
@@ -442,27 +442,28 @@ public class AndroidResourceProcessingAction {
         System.exit(1);
       }
 
-      resourceProcessor.processResources(
-          tmp,
-          aaptConfigOptions.aapt,
-          aaptConfigOptions.androidJar,
-          aaptConfigOptions.buildToolsVersion,
-          options.packageType,
-          aaptConfigOptions.debug,
-          options.packageForR,
-          new FlagAaptOptions(aaptConfigOptions),
-          aaptConfigOptions.resourceConfigs,
-          aaptConfigOptions.splits,
-          processedData,
-          data,
-          generatedSources,
-          options.packagePath,
-          options.proguardOutput,
-          options.mainDexProguardOutput,
-          options.resourcesOutput != null
-              ? processedData.getResourceDir().resolve("values").resolve("public.xml")
-              : null,
-          options.dataBindingInfoOut);
+      MergedAndroidData processedAndroidData =
+          resourceProcessor.processResources(
+              tmp,
+              aaptConfigOptions.aapt,
+              aaptConfigOptions.androidJar,
+              aaptConfigOptions.buildToolsVersion,
+              options.packageType,
+              aaptConfigOptions.debug,
+              options.packageForR,
+              new FlagAaptOptions(aaptConfigOptions),
+              aaptConfigOptions.resourceConfigs,
+              aaptConfigOptions.splits,
+              processedData,
+              data,
+              generatedSources,
+              options.packagePath,
+              options.proguardOutput,
+              options.mainDexProguardOutput,
+              options.resourcesOutput != null
+                  ? processedData.getResourceDir().resolve("values").resolve("public.xml")
+                  : null,
+              options.dataBindingInfoOut);
       logger.fine(String.format("aapt finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
 
       if (options.srcJarOutput != null) {
@@ -474,7 +475,7 @@ public class AndroidResourceProcessingAction {
             generatedSources, options.rOutput, VariantType.LIBRARY == options.packageType);
       }
       if (options.resourcesOutput != null) {
-        ResourcesZip.from(processedData.getResourceDir(), processedData.getAssetDir())
+        ResourcesZip.from(processedAndroidData.getResourceDir(), processedAndroidData.getAssetDir())
             .writeTo(options.resourcesOutput, false /* compress */);
       }
       logger.fine(