Don't propagate resources when neverlink is specified and manifest is not

We already handle this properly in the normal case. However, when no attributes
from the new implementation of resource processing are specified, we fall back
to the old version, which didn't handle this.

RELNOTES: none
PiperOrigin-RevId: 176672081

1 files changed, 19 insertions, 2 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
index 54808d2665..638344b945 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
@@ -1019,9 +1019,14 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
 
   @Test
   public void testNeverlinkTransitivity() throws Exception {
-    scratch.file("java/com/google/android/neversayneveragain/BUILD",
+    useConfiguration("--android_fixed_resource_neverlinking");
+
+    scratch.file(
+        "java/com/google/android/neversayneveragain/BUILD",
         "android_library(name = 'l1',",
-        "                srcs = ['l1.java'])",
+        "                srcs = ['l1.java'],",
+        "                manifest = 'AndroidManifest.xml',",
+        "                resource_files = ['res/values/resource.xml'])",
         "android_library(name = 'l2',",
         "                srcs = ['l2.java'],",
         "                deps = [':l1'],",
@@ -1056,6 +1061,10 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
         "java/com/google/android/neversayneveragain/libl4.jar_desugared.jar");
     assertThat(b1Inputs).contains(
         "java/com/google/android/neversayneveragain/libb1.jar_desugared.jar");
+    assertThat(
+            resourceInputPaths(
+                "java/com/google/android/neversayneveragain", getResourceContainer(b1)))
+        .doesNotContain("res/values/resource.xml");
 
     ConfiguredTarget b2 = getConfiguredTarget("//java/com/google/android/neversayneveragain:b2");
     Action b2DeployAction = actionsTestUtil().getActionForArtifactEndingWith(
@@ -1069,6 +1078,10 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
     assertThat(b2Inputs).containsAllOf(
         "java/com/google/android/neversayneveragain/_dx/l3/libl3.jar_desugared.jar",
         "java/com/google/android/neversayneveragain/libb2.jar_desugared.jar");
+    assertThat(
+        resourceInputPaths(
+            "java/com/google/android/neversayneveragain", getResourceContainer(b2)))
+        .doesNotContain("res/values/resource.xml");
 
     ConfiguredTarget b3 = getConfiguredTarget("//java/com/google/android/neversayneveragain:b3");
     Action b3DeployAction = actionsTestUtil().getActionForArtifactEndingWith(
@@ -1082,6 +1095,10 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
         "java/com/google/android/neversayneveragain/libb3.jar_desugared.jar");
     assertThat(b3Inputs)
         .doesNotContain("java/com/google/android/neversayneveragain/libl2.jar_desugared.jar");
+    assertThat(
+        resourceInputPaths(
+            "java/com/google/android/neversayneveragain", getResourceContainer(b3)))
+        .contains("res/values/resource.xml");
   }
 
   @Test