Fix issue with filtered resources

Apparently, I was using a flawed strategy to compute the filtered resource root
paths. Instead, just recalculate those roots from scratch, replicating the
behavior that existed before the change that caused problems.

RELNOTES: none
PiperOrigin-RevId: 192152306

2 files changed, 7 insertions, 7 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java
index 1f81b1300c..fdb5794913 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidResourcesTest.java
@@ -154,7 +154,8 @@ public class AndroidResourcesTest extends ResourceTestBase {
     ResourceFilter fakeFilter =
         ResourceFilter.of(ImmutableSet.copyOf(filteredResources), filteredDepsBuilder::add);
 
-    Optional<AndroidResources> filtered = unfiltered.maybeFilter(fakeFilter, isDependency);
+    Optional<AndroidResources> filtered =
+        unfiltered.maybeFilter(errorConsumer, fakeFilter, isDependency);
 
     if (filteredResources.equals(unfilteredResources)) {
       // We expect filtering to have been a no-op
@@ -245,8 +246,7 @@ public class AndroidResourcesTest extends ResourceTestBase {
             .add(getManifest())
             .build(),
         /* outputs = */ ImmutableList.of(
-            parsed.getCompiledSymbols(),
-            DataBinding.getSuffixedInfoFile(ruleContext, "_unused")));
+            parsed.getCompiledSymbols(), DataBinding.getSuffixedInfoFile(ruleContext, "_unused")));
   }
 
   /**
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 0ddd905060..0da528a31c 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
@@ -383,10 +383,10 @@ public class ResourceFilterFactoryTest extends ResourceTestBase {
         resourceFilterFactory.getResourceFilter(
             errorConsumer, resourceDependencies, localResources);
 
-    assertThat(localResources.filterLocalResources(filter).getResources())
+    assertThat(localResources.filterLocalResources(errorConsumer, filter).getResources())
         .containsExactly(localResourceToKeep);
 
-    ResourceDependencies filteredResourceDeps = resourceDependencies.filter(filter);
+    ResourceDependencies filteredResourceDeps = resourceDependencies.filter(errorConsumer, filter);
 
     // TODO: Remove - assert was same order before
     assertThat(resourceDependencies.getTransitiveResources())
@@ -500,8 +500,8 @@ public class ResourceFilterFactoryTest extends ResourceTestBase {
     ResourceFilter filter =
         resourceFilterFactory.getResourceFilter(errorConsumer, resourceDeps, localResources);
 
-    assertThat(resourceDeps.filter(filter)).isSameAs(resourceDeps);
+    assertThat(resourceDeps.filter(errorConsumer, filter)).isSameAs(resourceDeps);
 
-    return localResources.filterLocalResources(filter).getResources();
+    return localResources.filterLocalResources(errorConsumer, filter).getResources();
   }
 }