Automated rollback of commit 372fbc2f016157b0331f83a20edad10d4b4cf9f7.

*** Reason for rollback ***

Roll forward with fix:

I was assuming that R.txt and symbols files are always set, but they can be
null in some cases (especially in the old data processing pipeline). Properly
handle them here.

RELNOTES: none
PiperOrigin-RevId: 198075743

2 files changed, 13 insertions, 1 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataConverterTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataConverterTest.java
index 36f5cac050..51bcd14639 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataConverterTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidDataConverterTest.java
@@ -68,6 +68,16 @@ public class AndroidDataConverterTest {
   }
 
   @Test
+  public void testMaybeWithArtifact() {
+    assertMap(
+            AndroidDataConverter.<String>builder(JoinerType.COLON_COMMA)
+                .maybeWithArtifact(getFunction(null))
+                .maybeWithArtifact(getFunction(null))
+                .build())
+        .isEqualTo(":");
+  }
+
+  @Test
   public void test() {
     assertMap(
             AndroidDataConverter.<String>builder(JoinerType.SEMICOLON_AMPERSAND)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
index 6ba8585b01..cdd630c618 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
@@ -1059,7 +1059,9 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase {
     ConfiguredTarget foo = getConfiguredTarget(target);
     SpawnAction action = (SpawnAction) actionsTestUtil().getActionForArtifactEndingWith(
         getFilesToBuild(foo), "r.srcjar");
-    assertThat(action.getArguments().contains("--debug")).isEqualTo(isDebug);
+
+    assertThat(ImmutableList.copyOf(paramFileArgsOrActionArgs(action)).contains("--debug"))
+        .isEqualTo(isDebug);
   }
 
   @Test