Rollback of commit dfde4e5cd86f00c30bdedeed020844c861658b53.

*** Reason for rollback ***

Broke a test

*** Original change description ***

experimental_ios_test: Support data dependencies

This CL makes me so unhappy. As a follow up, I may rename BaseRule and/or RuleBase. Because seriously, you guys, naming.

--
MOS_MIGRATED_REVID=96804486

3 files changed, 6 insertions, 18 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalIosTest.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalIosTest.java
index 069963c298..cad88fe005 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalIosTest.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalIosTest.java
@@ -38,8 +38,7 @@ public final class ExperimentalIosTest extends IosTest {
   public ConfiguredTarget create(RuleContext ruleContext, ObjcCommon common,
       XcodeProvider xcodeProvider, NestedSet<Artifact> filesToBuild) throws InterruptedException {
 
-    Runfiles.Builder runfilesBuilder = new Runfiles.Builder()
-        .addRunfiles(ruleContext, RunfilesProvider.DEFAULT_RUNFILES);
+    Runfiles.Builder runfilesBuilder = new Runfiles.Builder();
     NestedSetBuilder<Artifact> filesToBuildBuilder = NestedSetBuilder.<Artifact>stableOrder();
     filesToBuildBuilder.addTransitive(filesToBuild);
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java
index 2163ae0d4a..c70a25e735 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java
@@ -47,7 +47,7 @@ public class ObjcProtoLibraryRule implements RuleDefinition {
         The directly depended upon proto_library rules.
         ${SYNOPSIS}
         <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/
-        .override(attr("deps", LABEL_LIST)
+        .add(attr("deps", LABEL_LIST)
             .allowedRuleClasses("proto_library", "filegroup")
             .legacyAllowAnyFileType())
         /* <!-- #BLAZE_RULE(objc_proto_library).ATTRIBUTE(options_file) -->
@@ -85,9 +85,7 @@ public class ObjcProtoLibraryRule implements RuleDefinition {
     return RuleDefinition.Metadata.builder()
         .name("objc_proto_library")
         .factoryClass(ObjcProtoLibrary.class)
-        .ancestors(
-            BaseRuleClasses.RuleBase.class,
-            ObjcRuleClasses.ObjcProtoRule.class)
+        .ancestors(BaseRuleClasses.BaseRule.class, ObjcRuleClasses.ObjcProtoRule.class)
         .build();
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
index 88d0049e1e..5207f1ecf0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
@@ -28,7 +28,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.BaseRuleClasses;
 import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode;
 import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
 import com.google.devtools.build.lib.analysis.RuleContext;
@@ -598,7 +597,7 @@ public class ObjcRuleClasses {
           The list of targets that are linked together to form the final bundle.
           ${SYNOPSIS}
           <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/
-          .override(attr("deps", LABEL_LIST)
+          .add(attr("deps", LABEL_LIST)
               .direct_compile_time_input()
               .allowedRuleClasses(ALLOWED_DEPS_RULE_CLASSES)
               .allowedFileTypes())
@@ -631,11 +630,7 @@ public class ObjcRuleClasses {
       return RuleDefinition.Metadata.builder()
           .name("$objc_compiling_rule")
           .type(RuleClassType.ABSTRACT)
-          .ancestors(
-              BaseRuleClasses.RuleBase.class,
-              CompileDependencyRule.class,
-              OptionsRule.class,
-              CoptsRule.class)
+          .ancestors(CompileDependencyRule.class, OptionsRule.class, CoptsRule.class)
           .build();
     }
   }
@@ -813,11 +808,7 @@ public class ObjcRuleClasses {
           .name("$ios_test_base_rule")
           .type(RuleClassType.ABSTRACT)
           .ancestors(
-              CompilingRule.class,
-              ReleaseBundlingRule.class,
-              LinkingRule.class,
-              XcodegenRule.class,
-              SimulatorRule.class)
+              ReleaseBundlingRule.class, LinkingRule.class, XcodegenRule.class, SimulatorRule.class)
           .build();
     }
   }