Remove unused codepaths now that non_propagated_deps has been removed as an attribute.

PiperOrigin-RevId: 198735448

2 files changed, 1 insertions, 65 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
index b4d0bac360..e7465bb3f2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
@@ -158,7 +158,6 @@ public final class ObjcCommon {
     private Optional<CompilationArtifacts> compilationArtifacts = Optional.absent();
     private ImmutableSet.Builder<Artifact> textualHeaders = ImmutableSet.builder();
     private Iterable<ObjcProvider> depObjcProviders = ImmutableList.of();
-    private Iterable<ObjcProvider> directDepObjcProviders = ImmutableList.of();
     private Iterable<ObjcProvider> runtimeDepObjcProviders = ImmutableList.of();
     private Iterable<ObjcProvider> repropagatedModuleMapObjcProviders = ImmutableList.of();
     private Iterable<String> defines = ImmutableList.of();
@@ -327,16 +326,6 @@ public final class ObjcCommon {
       return this;
     }
 
-    /**
-     * Add providers which will only be used by the declaring rule, and won't be propagated to any
-     * dependers on the declaring rule.
-     */
-    Builder addNonPropagatedDepObjcProviders(Iterable<ObjcProvider> directDepObjcProviders) {
-      this.directDepObjcProviders =
-          Iterables.concat(this.directDepObjcProviders, directDepObjcProviders);
-      return this;
-    }
-
     /** Adds includes to be passed into compile actions with {@code -I}. */
     public Builder addIncludes(Iterable<PathFragment> includes) {
       this.includes = Iterables.concat(this.includes, includes);
@@ -444,8 +433,7 @@ public final class ObjcCommon {
               .add(IQUOTE, buildConfiguration.getGenfilesFragment())
               .addAllForDirectDependents(INCLUDE, directDependencyIncludes)
               .addAll(DEFINE, defines)
-              .addTransitiveAndPropagate(depObjcProviders)
-              .addTransitiveWithoutPropagating(directDepObjcProviders);
+              .addTransitiveAndPropagate(depObjcProviders);
 
       for (ObjcProvider provider : runtimeDepObjcProviders) {
         objcProvider.addTransitiveAndPropagate(ObjcProvider.DYNAMIC_FRAMEWORK_FILE, provider);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
index e4c13b0d58..fd955b4e04 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
@@ -1027,58 +1027,6 @@ public final class ObjcProvider extends NativeInfo implements ObjcProviderApi<Ar
     }
 
     /**
-     * Add elements from providers, but don't propagate them to any dependers on this ObjcProvider.
-     * These elements will be exposed to {@link #get(Key)} calls, but not to any ObjcProviders
-     * which add this provider to themselves.
-     */
-    public Builder addTransitiveWithoutPropagating(Iterable<ObjcProvider> providers) {
-      for (ObjcProvider provider : providers) {
-        addTransitiveWithoutPropagating(provider);
-      }
-      return this;
-    }
-
-    /**
-     * Add all keys and values from provider, without propagating them to any (transitive) dependers
-     * on this ObjcProvider. These elements will be exposed to {@link #get(Key)} calls, but not to
-     * any ObjcProviders which add this provider to themselves.
-     */
-    public Builder addTransitiveWithoutPropagating(ObjcProvider provider) {
-      for (Map.Entry<Key<?>, NestedSet<?>> typeEntry : provider.items.entrySet()) {
-        uncheckedAddTransitive(typeEntry.getKey(), typeEntry.getValue(), this.nonPropagatedItems);
-      }
-      for (Map.Entry<Key<?>, NestedSet<?>> typeEntry : provider.strictDependencyItems.entrySet()) {
-        uncheckedAddTransitive(typeEntry.getKey(), typeEntry.getValue(), this.nonPropagatedItems);
-      }
-      return this;
-    }
-
-    /**
-     * Add a single key from provider, without propagating them to any (transitive) dependers
-     * on this ObjcProvider. These elements will be exposed to {@link #get(Key)} calls, but not to
-     * any ObjcProviders which add this provider to themselves.
-     */
-    public Builder addTransitiveWithoutPropagating(Key key, ObjcProvider provider) {
-      if (provider.items.containsKey(key)) {
-        uncheckedAddTransitive(key, provider.items.get(key), this.nonPropagatedItems);
-      }
-      if (provider.strictDependencyItems.containsKey(key)) {
-        uncheckedAddTransitive(
-            key, provider.strictDependencyItems.get(key), this.nonPropagatedItems);
-      }
-      return this;
-    }
-
-    /**
-     * Adds elements in items, without propagating them to any (transitive) dependers on this
-     * ObjcProvider.
-     */
-    public <E> Builder addTransitiveWithoutPropagating(Key<E> key, NestedSet<E> items) {
-      uncheckedAddTransitive(key, items, this.nonPropagatedItems);
-      return this;
-    }
-
-    /**
      * Add element, and propagate it to any (transitive) dependers on this ObjcProvider.
      */
     public <E> Builder add(Key<E> key, E toAdd) {