1 files changed, 9 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
index 055990bebd..650d39cada 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceMergingActionBuilder.java
@@ -34,17 +34,16 @@ public class AndroidResourceMergingActionBuilder {
       AndroidDataConverter.MERGABLE_DATA_CONVERTER;
 
   @AutoCodec @AutoCodec.VisibleForSerialization
-  static final AndroidDataConverter<CompiledMergableAndroidData>
-      RESOURCE_CONTAINER_TO_ARG_FOR_COMPILED =
-          AndroidDataConverter.<CompiledMergableAndroidData>builder(JoinerType.SEMICOLON_AMPERSAND)
-              .withRoots(CompiledMergableAndroidData::getResourceRoots)
-              .withRoots(CompiledMergableAndroidData::getAssetRoots)
-              .withLabel(CompiledMergableAndroidData::getLabel)
-              .withArtifact(CompiledMergableAndroidData::getCompiledSymbols)
-              .build();
+  static final AndroidDataConverter<ParsedAndroidResources> RESOURCE_CONTAINER_TO_ARG_FOR_COMPILED =
+      AndroidDataConverter.<ParsedAndroidResources>builder(JoinerType.SEMICOLON_AMPERSAND)
+          .withRoots(ParsedAndroidResources::getResourceRoots)
+          .withRoots(ParsedAndroidResources::getAssetRoots)
+          .withLabel(ParsedAndroidResources::getLabel)
+          .withArtifact(ParsedAndroidResources::getCompiledSymbols)
+          .build();
 
   // Inputs
-  private CompiledMergableAndroidData primary;
+  private ParsedAndroidResources primary;
   private ResourceDependencies dependencies;
 
   // Outputs
@@ -62,7 +61,7 @@ public class AndroidResourceMergingActionBuilder {
    * The primary resource for merging. This resource will overwrite any resource or data value in
    * the transitive closure.
    */
-  private AndroidResourceMergingActionBuilder withPrimary(CompiledMergableAndroidData primary) {
+  private AndroidResourceMergingActionBuilder withPrimary(ParsedAndroidResources primary) {
     this.primary = primary;
     return this;
   }