Remove LIPO support

RELNOTES: Support for LIPO has been fully removed.
PiperOrigin-RevId: 200724578

1 files changed, 16 insertions, 19 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
index fac653b402..d1f1ecc848 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
@@ -169,14 +169,16 @@ public class BaseRuleClasses {
               attr("$test_runtime", LABEL_LIST)
                   .cfg(HostTransition.INSTANCE)
                   .value(ImmutableList.of(env.getToolsLabel("//tools/test:runtime"))))
-          .add(attr("$test_setup_script", LABEL)
-              .cfg(HostTransition.INSTANCE)
-              .singleArtifact()
-              .value(env.getToolsLabel("//tools/test:test_setup")))
-          .add(attr("$collect_coverage_script", LABEL)
-              .cfg(HostTransition.INSTANCE)
-              .singleArtifact()
-              .value(env.getToolsLabel("//tools/test:collect_coverage")))
+          .add(
+              attr("$test_setup_script", LABEL)
+                  .cfg(HostTransition.INSTANCE)
+                  .singleArtifact()
+                  .value(env.getToolsLabel("//tools/test:test_setup")))
+          .add(
+              attr("$collect_coverage_script", LABEL)
+                  .cfg(HostTransition.INSTANCE)
+                  .singleArtifact()
+                  .value(env.getToolsLabel("//tools/test:collect_coverage")))
           // Input files for test actions collecting code coverage
           .add(
               attr(":coverage_support", LABEL)
@@ -190,14 +192,8 @@ public class BaseRuleClasses {
                       coverageReportGeneratorAttribute(
                           env.getToolsLabel(DEFAULT_COVERAGE_REPORT_GENERATOR_VALUE)))
                   .singleArtifact())
-
-          // The target itself and run_under both run on the same machine. We use the DATA config
-          // here because the run_under acts like a data dependency (e.g. no LIPO optimization).
-          .add(
-              attr(":run_under", LABEL)
-                  .cfg(env.getLipoDataTransition())
-                  .value(RUN_UNDER)
-                  .skipPrereqValidatorCheck())
+          // The target itself and run_under both run on the same machine.
+          .add(attr(":run_under", LABEL).value(RUN_UNDER).skipPrereqValidatorCheck())
           .executionPlatformConstraintsAllowed(ExecutionPlatformConstraintsAllowed.PER_TARGET)
           .build();
     }
@@ -382,9 +378,10 @@ public class BaseRuleClasses {
     public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
       return builder
           .add(attr("deps", LABEL_LIST).legacyAllowAnyFileType())
-          .add(attr("data", LABEL_LIST).cfg(env.getLipoDataTransition())
-              .allowedFileTypes(FileTypeSet.ANY_FILE)
-              .dontCheckConstraints())
+          .add(
+              attr("data", LABEL_LIST)
+                  .allowedFileTypes(FileTypeSet.ANY_FILE)
+                  .dontCheckConstraints())
           .build();
     }