Move resource busybox actions to BusyBoxActionBuilder and AndroidDataContext

BusyBoxActionBuilder makes much cleaner action builders while making it harder
to do Bad Things (like collapsing NestedSets in analysis, or adding an artifact
to one of the command line and the inputs but not both).

Also:
- In merging, simplify the code somewhat by removing unneeded conditionals -
  for example, the parsed merging action will always be built given the current
  code.
- In the few builders where we aren't doing so already, parameter files should
  always be shell quoted and always be used when the OS is Windows. The BusyBox
  should always support the former and require the latter (although
  sufficiently large inputs may have masked this by triggering parameter files
  in Windows anyway).
- In the builder for linking (within validation), no longer collapse the
  NestedSet of transitiveCompiledSymbols when adding them to the inputs. Using
  the new BusyBoxActionBuilder code, trying to do this would throw an
  IllegalStateException.

RELNOTES: none
PiperOrigin-RevId: 197728382

1 files changed, 3 insertions, 1 deletions

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