Final asset/resource decoupling cleanup

- Remove MergableAndroidData interface, and clean up various converters to
  explicitly use ParsedAndroid{Resources|Assets}
- Remove calls to getters that always return an empty list (based on the above
  cleanup)
- Stop passing around empty transitiveAssets in ResourceDependencies and
  AndroidResourcesInfo
- Remove no-op getter method for decoupling settings in AndroidConfiguration

Also, consolidate all AndroidDataConverter instances that were used in multiple
places into the AndroidDataConverter class, rather than declaring them in
multiple places. Add a bit of documentation as to which objects they represent
in the action code, which should make mapping between one and the other easier.

RELNOTES: none
PiperOrigin-RevId: 208042452

1 files changed, 10 insertions, 22 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 650d39cada..9d0b1ba6cd 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
@@ -17,8 +17,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.rules.android.AndroidDataConverter.JoinerType;
-import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import javax.annotation.Nullable;
 
 /**
@@ -30,18 +28,6 @@ import javax.annotation.Nullable;
  */
 public class AndroidResourceMergingActionBuilder {
 
-  private static final AndroidDataConverter<MergableAndroidData> RESOURCE_CONTAINER_TO_ARG =
-      AndroidDataConverter.MERGABLE_DATA_CONVERTER;
-
-  @AutoCodec @AutoCodec.VisibleForSerialization
-  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 ParsedAndroidResources primary;
   private ResourceDependencies dependencies;
@@ -127,7 +113,7 @@ public class AndroidResourceMergingActionBuilder {
     createInputsForBuilder(builder)
         .addInput(
             "--primaryData",
-            RESOURCE_CONTAINER_TO_ARG_FOR_COMPILED.map(primary),
+            AndroidDataConverter.COMPILED_RESOURCE_CONVERTER.map(primary),
             Iterables.concat(
                 primary.getArtifacts(), ImmutableList.of(primary.getCompiledSymbols())));
 
@@ -136,13 +122,12 @@ public class AndroidResourceMergingActionBuilder {
           .addTransitiveFlag(
               "--data",
               dependencies.getTransitiveResourceContainers(),
-              RESOURCE_CONTAINER_TO_ARG_FOR_COMPILED)
+              AndroidDataConverter.COMPILED_RESOURCE_CONVERTER)
           .addTransitiveFlag(
               "--directData",
               dependencies.getDirectResourceContainers(),
-              RESOURCE_CONTAINER_TO_ARG_FOR_COMPILED)
+              AndroidDataConverter.COMPILED_RESOURCE_CONVERTER)
           .addTransitiveInputValues(dependencies.getTransitiveResources())
-          .addTransitiveInputValues(dependencies.getTransitiveAssets())
           .addTransitiveInputValues(dependencies.getTransitiveCompiledSymbols());
     }
 
@@ -155,17 +140,20 @@ public class AndroidResourceMergingActionBuilder {
     createInputsForBuilder(builder)
         .addInput(
             "--primaryData",
-            RESOURCE_CONTAINER_TO_ARG.map(primary),
+            AndroidDataConverter.PARSED_RESOURCE_CONVERTER.map(primary),
             Iterables.concat(primary.getArtifacts(), ImmutableList.of(primary.getSymbols())));
 
     if (dependencies != null) {
       builder
           .addTransitiveFlag(
-              "--data", dependencies.getTransitiveResourceContainers(), RESOURCE_CONTAINER_TO_ARG)
+              "--data",
+              dependencies.getTransitiveResourceContainers(),
+              AndroidDataConverter.PARSED_RESOURCE_CONVERTER)
           .addTransitiveFlag(
-              "--directData", dependencies.getDirectResourceContainers(), RESOURCE_CONTAINER_TO_ARG)
+              "--directData",
+              dependencies.getDirectResourceContainers(),
+              AndroidDataConverter.PARSED_RESOURCE_CONVERTER)
           .addTransitiveInputValues(dependencies.getTransitiveResources())
-          .addTransitiveInputValues(dependencies.getTransitiveAssets())
           .addTransitiveInputValues(dependencies.getTransitiveSymbolsBin());
     }