Automated rollback of commit a76c94be7c56b93fc5a2f9ececfba7ac1f61f69c.

*** Reason for rollback ***

Caused memory regression.

*** Original change description ***

CustomCommandLine.Builder: clean up its interface

In this commit:
- remove unused methods and classes
- turn CustomCommandLine.ArgvFragment into an
  interface
- remove the
  CustomCommandLine.TreeFileArtifactArgvFragment
  abstract class; it only had one remaining
  subclass
- add @Nullable annotations where nulls are fine
- add Precondition checks for non-nullable args
- simplify the interface by removing add* methods
  that can be composed of other add* methods; this
  makes it easier to see...

***

RELNOTES: none
PiperOrigin-RevId: 162320031

1 files changed, 13 insertions, 16 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/LipoSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/LipoSupport.java
index bad646175a..41487ecc43 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/LipoSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/LipoSupport.java
@@ -29,7 +29,7 @@ import com.google.devtools.build.lib.rules.apple.ApplePlatform;
  */
 public class LipoSupport {
   private final RuleContext ruleContext;
-
+  
   public LipoSupport(RuleContext ruleContext) {
     this.ruleContext = ruleContext;
   }
@@ -46,21 +46,18 @@ public class LipoSupport {
   public LipoSupport registerCombineArchitecturesAction(
       NestedSet<Artifact> inputBinaries, Artifact outputBinary, ApplePlatform platform) {
     if (inputBinaries.toList().size() > 1) {
-      ruleContext.registerAction(
-          ObjcRuleClasses.spawnAppleEnvActionBuilder(
-                  ruleContext.getFragment(AppleConfiguration.class), platform)
-              .setMnemonic("ObjcCombiningArchitectures")
-              .addTransitiveInputs(inputBinaries)
-              .addOutput(outputBinary)
-              .setExecutable(CompilationSupport.xcrunwrapper(ruleContext))
-              .setCommandLine(
-                  CustomCommandLine.builder()
-                      .add(ObjcRuleClasses.LIPO)
-                      .add("-create")
-                      .addExecPaths(inputBinaries)
-                      .addExecPath("-o", outputBinary)
-                      .build())
-              .build(ruleContext));
+      ruleContext.registerAction(ObjcRuleClasses.spawnAppleEnvActionBuilder(
+              ruleContext.getFragment(AppleConfiguration.class), platform)
+          .setMnemonic("ObjcCombiningArchitectures")
+          .addTransitiveInputs(inputBinaries)
+          .addOutput(outputBinary)
+          .setExecutable(CompilationSupport.xcrunwrapper(ruleContext))
+          .setCommandLine(CustomCommandLine.builder()
+              .add(ObjcRuleClasses.LIPO)
+              .addExecPaths("-create", inputBinaries)
+              .addExecPath("-o", outputBinary)
+              .build())
+          .build(ruleContext));
     } else {
       ruleContext.registerAction(new SymlinkAction(
           ruleContext.getActionOwner(),