[apple] Stop propagating underlying libraries when using resources_from_deps.

src/com/facebook/buck/apple/AppleBuildRules.java

@@ -164,7 +164,13 @@ public static ImmutableSet<TargetNode<?>> getRecursiveTargetNodeDependenciesOfTy
                   .map(TargetNode::getConstructorArg)
                   .map(arg -> targetGraph.getAll(arg.getResourcesFromDeps()));
           if (iterable.isPresent()) {
-            return iterable.get().iterator();
+            if (mode == RecursiveDependenciesMode.LINKING) {
+              // If this is a resource dependency, we should not be providing
+              // the underlying libraries for linking
+              return Collections.emptyIterator();
+            } else {
+              return iterable.get().iterator();
+            }
           }
 
           // Stop traversal for rules outside the specific set.

test/com/facebook/buck/apple/AppleBuildRulesTest.java

@@ -42,8 +42,10 @@
 import com.facebook.buck.io.filesystem.ProjectFilesystem;
 import com.facebook.buck.io.filesystem.impl.FakeProjectFilesystem;
 import com.facebook.buck.shell.GenruleBuilder;
+import com.facebook.buck.util.ProcessExecutor;
 import com.facebook.buck.util.environment.Platform;
 import com.facebook.buck.util.types.Either;
+import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
@@ -220,6 +222,85 @@ public void exportedDepsOfDylibsAreCollectedForLinking() {
     }
   }
 
+  @Test
+  public void resourcesFromDepsAreIncludedButNotLinked() {
+    BuildTarget fooResourceTarget = BuildTargetFactory.newInstance("//shared:resource");
+    TargetNode<?> fooResourceNode =
+      AppleResourceBuilder.createBuilder(fooResourceTarget).build();
+
+    BuildTarget fooLibTarget =
+      BuildTargetFactory.newInstance("//foo:lib");
+    TargetNode<?> fooLibNode =
+      AppleLibraryBuilder.createBuilder(fooLibTarget)
+        .setDeps(ImmutableSortedSet.of(fooResourceTarget))
+        .build();
+
+    // Create new resource w/ resources from foo:lib
+    BuildTarget transitiveResourceTarget = BuildTargetFactory.newInstance("//shared:resource2");
+    TargetNode<?> transitiveResourceNode =
+      AppleResourceBuilder.createBuilder(transitiveResourceTarget)
+        .setResourcesFromDeps(ImmutableSortedSet.of(fooLibTarget))
+        .build();
+
+    BuildTarget barLibTarget =
+      BuildTargetFactory.newInstance("//foo:lib2");
+    TargetNode<?> barLibNode =
+      AppleLibraryBuilder.createBuilder(barLibTarget)
+        .setDeps(ImmutableSortedSet.of(transitiveResourceTarget))
+        .build();
+
+    ImmutableSet<TargetNode<?>> targetNodes =
+      ImmutableSet.<TargetNode<?>>builder()
+        .add(
+          fooResourceNode,
+          fooLibNode,
+          transitiveResourceNode,
+          barLibNode)
+        .build();
+
+    TargetGraph targetGraph = TargetGraphFactory.newInstance(targetNodes);
+
+    ImmutableSortedSet<?> expectedFullDeps = ImmutableSortedSet.of(
+      fooResourceNode,
+      fooLibNode,
+      transitiveResourceNode
+    );
+
+    ImmutableSortedSet<?> expectedLinkingDeps = ImmutableSortedSet.of(transitiveResourceNode);
+
+    Iterable<TargetNode<?>> buildingRules =
+      AppleBuildRules.getRecursiveTargetNodeDependenciesOfTypes(
+        xcodeDescriptions,
+        targetGraph,
+        Optional.empty(),
+        AppleBuildRules.RecursiveDependenciesMode.BUILDING,
+        barLibNode,
+        Optional.empty());
+    assertEquals(expectedFullDeps, ImmutableSortedSet.copyOf(buildingRules));
+
+    Iterable<TargetNode<?>> linkingRules =
+      AppleBuildRules.getRecursiveTargetNodeDependenciesOfTypes(
+        xcodeDescriptions,
+        targetGraph,
+        Optional.empty(),
+        AppleBuildRules.RecursiveDependenciesMode.LINKING,
+        barLibNode,
+        Optional.empty());
+    assertEquals(expectedLinkingDeps, ImmutableSortedSet.copyOf(linkingRules));
+
+    Iterable<TargetNode<?>> copyingRules =
+      AppleBuildRules.getRecursiveTargetNodeDependenciesOfTypes(
+        xcodeDescriptions,
+        targetGraph,
+        Optional.empty(),
+        AppleBuildRules.RecursiveDependenciesMode.COPYING,
+        barLibNode,
+        Optional.empty());
+    assertEquals(expectedFullDeps, ImmutableSortedSet.copyOf(copyingRules));
+
+
+  }
+
   @Test
   public void resourceDepsOfDylibsAreNotIncludedInMainBundle() {
     BuildTarget sharedResourceTarget = BuildTargetFactory.newInstance("//shared:resource");

test/com/facebook/buck/apple/AppleResourceBuilder.java

@@ -20,6 +20,7 @@
 import com.facebook.buck.core.model.targetgraph.AbstractNodeBuilder;
 import com.facebook.buck.core.rules.BuildRule;
 import com.facebook.buck.core.sourcepath.SourcePath;
+import com.google.common.collect.ImmutableSet;
 import java.util.Set;
 
 public class AppleResourceBuilder
@@ -51,4 +52,9 @@ public AppleResourceBuilder setVariants(Set<SourcePath> variants) {
     getArgForPopulating().setVariants(variants);
     return this;
   }
+
+  public AppleResourceBuilder setResourcesFromDeps(Set<BuildTarget> deps) {
+    getArgForPopulating().setResourcesFromDeps(deps);
+    return this;
+  }
 }