Properly expose resource artifacts in MergableAndroidData interface

In hindsight, I should have done this a few changes ago, but the relevant
change is already submitted.

We need the artifacts for use in some cases where we want to use
AndroidResources and ResourceContainer interchangably during migration.

RELNOTES: none
PiperOrigin-RevId: 193038067

2 files changed, 10 insertions, 9 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java
index a861b18517..387270df7d 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AarImportTest.java
@@ -90,12 +90,12 @@ public class AarImportTest extends BuildViewTestCase {
     assertThat(resourceContainer.getManifest()).isNotNull();
 
     Artifact resourceTreeArtifact =
-        Iterables.getOnlyElement(resourceContainer.getResources().getResources());
+        Iterables.getOnlyElement(resourceContainer.getResources());
     assertThat(resourceTreeArtifact.isTreeArtifact()).isTrue();
     assertThat(resourceTreeArtifact.getExecPathString()).endsWith("_aar/unzipped/resources/foo");
 
     Artifact assetsTreeArtifact =
-        Iterables.getOnlyElement(resourceContainer.getAssets().getAssets());
+        Iterables.getOnlyElement(resourceContainer.getAssets());
     assertThat(assetsTreeArtifact.isTreeArtifact()).isTrue();
     assertThat(assetsTreeArtifact.getExecPathString()).endsWith("_aar/unzipped/assets/foo");
   }
@@ -109,8 +109,8 @@ public class AarImportTest extends BuildViewTestCase {
             .toList()
             .get(0);
 
-    Artifact resourceTreeArtifact = resourceContainer.getResources().getResources().get(0);
-    Artifact assetsTreeArtifact = resourceContainer.getAssets().getAssets().get(0);
+    Artifact resourceTreeArtifact = resourceContainer.getResources().get(0);
+    Artifact assetsTreeArtifact = resourceContainer.getAssets().get(0);
     Artifact aarResourcesExtractor =
         getHostConfiguredTarget(
             ruleClassProvider.getToolsRepository() + "//tools/android:aar_resources_extractor")
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java
index 0da528a31c..6829c396be 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceFilterFactoryTest.java
@@ -60,7 +60,8 @@ public class ResourceFilterFactoryTest extends ResourceTestBase {
             manifest.getOwnerLabel().getPackageName(), "resourceContainer_" + resources.hashCode());
 
     return ResourceContainer.builder()
-        .setResources(AndroidResources.forResources(errorConsumer, resources, "resource_files"))
+        .setAndroidResources(
+            AndroidResources.forResources(errorConsumer, resources, "resource_files"))
         .setLabel(label)
         .setManifestExported(false)
         .setManifest(manifest)
@@ -401,11 +402,11 @@ public class ResourceFilterFactoryTest extends ResourceTestBase {
         filteredResourceDeps.getDirectResourceContainers().toList();
     assertThat(directContainers).hasSize(2);
 
-    AndroidResources directToDiscard = directContainers.get(0).getResources();
+    AndroidResources directToDiscard = directContainers.get(0).getAndroidResources();
     assertThat(directToDiscard.getResources()).isEmpty();
     assertThat(directToDiscard.getResourceRoots()).isEmpty();
 
-    AndroidResources directToKeep = directContainers.get(1).getResources();
+    AndroidResources directToKeep = directContainers.get(1).getAndroidResources();
     assertThat(directToKeep.getResources()).containsExactly(directResourceToKeep);
     assertThat(directToKeep.getResourceRoots())
         .containsExactly(
@@ -415,11 +416,11 @@ public class ResourceFilterFactoryTest extends ResourceTestBase {
         filteredResourceDeps.getTransitiveResourceContainers().toList();
     assertThat(transitiveContainers).hasSize(2);
 
-    AndroidResources transitiveToDiscard = transitiveContainers.get(0).getResources();
+    AndroidResources transitiveToDiscard = transitiveContainers.get(0).getAndroidResources();
     assertThat(transitiveToDiscard.getResources()).isEmpty();
     assertThat(transitiveToDiscard.getResourceRoots()).isEmpty();
 
-    AndroidResources transitiveToKeep = transitiveContainers.get(1).getResources();
+    AndroidResources transitiveToKeep = transitiveContainers.get(1).getAndroidResources();
     assertThat(transitiveToKeep.getResources()).containsExactly(transitiveResourceToKeep);
     assertThat(transitiveToKeep.getResourceRoots())
         .containsExactly(