From a9eb2403e2832859cbce5e6a06f4142ea4acd9c8 Mon Sep 17 00:00:00 2001 From: kaipi Date: Wed, 30 May 2018 14:34:50 -0700 Subject: Remove the non_propagated_deps attribute from objc_library and apple_binary. This was a workaround created to deal with duplicated symbol errors, but there are now better ways to avoid them than using this attribute. RELNOTES: non_propagated_deps has been removed from objc_library and apple_binary. PiperOrigin-RevId: 198620886 --- .../lib/rules/objc/AppleBinarySkylarkApiTest.java | 1 - .../build/lib/rules/objc/ObjcLibraryTest.java | 55 ---------------------- 2 files changed, 56 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/rules/objc') diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinarySkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinarySkylarkApiTest.java index 8f7f1d047d..7cc75c1766 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinarySkylarkApiTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinarySkylarkApiTest.java @@ -92,7 +92,6 @@ public class AppleBinarySkylarkApiTest extends AppleBinaryTest { " default=Label('" + toolsLoc + ":xcrunwrapper')),", " 'binary_type': attr.string(),", " 'bundle_loader': attr.label(aspects=[apple_common.objc_proto_aspect],),", - " 'non_propagated_deps': attr.label_list(cfg=apple_common.multi_arch_split),", " 'deps': attr.label_list(", " cfg=apple_common.multi_arch_split,", " aspects=[apple_common.objc_proto_aspect],", diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java index 2880f76d93..f8f21a33b2 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java @@ -383,31 +383,6 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { .containsExactly("objc/a.h", "objc/b.h", "objc/f.m", "objc2/d.h", "objc2/e.m"); } - @Test - public void testNonPropagatedDepsProvider() throws Exception { - ConfiguredTarget target = - createLibraryTargetWriter("//objc:lib") - .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") - .setAndCreateFiles("hdrs", "a.h", "b.h") - .write(); - createLibraryTargetWriter("//objc2:lib") - .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") - .setAndCreateFiles("hdrs", "c.h", "d.h") - .setList("non_propagated_deps", "//objc:lib") - .write(); - ConfiguredTarget transitiveDepender = - createLibraryTargetWriter("//objc3:lib") - .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") - .setAndCreateFiles("hdrs", "e.h", "f.h") - .setList("non_propagated_deps", "//objc2:lib") - .write(); - - assertThat(getArifactPaths(target, HEADER)) - .containsExactly("objc/a.h", "objc/b.h"); - assertThat(getArifactPaths(transitiveDepender, HEADER)) - .containsExactly("objc2/c.h", "objc2/d.h", "objc3/e.h", "objc3/f.h"); - } - @Test public void testMultiPlatformLibrary() throws Exception { useConfiguration("--ios_multi_cpus=i386,x86_64,armv7,arm64", "--ios_cpu=armv7"); @@ -420,36 +395,6 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { assertThat(view.hasErrors(getConfiguredTarget("//objc:lib"))).isFalse(); } - @Test - public void testNonPropagatedDepsDiamond() throws Exception { - // Non-propagated. - createLibraryTargetWriter("//objc:lib") - .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") - .setAndCreateFiles("hdrs", "a.h") - .write(); - // Conflicts with non-propagated. - createLibraryTargetWriter("//objc2:lib") - .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") - .setAndCreateFiles("hdrs", "a.h") - .write(); - - createLibraryTargetWriter("//objc3:lib") - .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") - .setAndCreateFiles("hdrs", "b.h") - .setList("non_propagated_deps", "//objc:lib") - .write(); - - createLibraryTargetWriter("//objc4:lib") - .setAndCreateFiles("srcs", "a.m", "b.m", "private.h") - .setAndCreateFiles("hdrs", "c.h") - .setList("deps", "//objc2:lib", "//objc3:lib") - .write(); - - CommandAction action = compileAction("//objc4:lib", "a.o"); - assertThat(Artifact.toRootRelativePaths(action.getPossibleInputsForTesting())) - .containsAllOf("objc2/a.h", "objc3/b.h", "objc4/c.h", "objc4/a.m", "objc4/private.h"); - } - static Iterable iquoteArgs(ObjcProvider provider, BuildConfiguration configuration) { return Interspersing.beforeEach( "-iquote", -- cgit v1.2.3