From 618a2bf3574015d1d341d59a34e4d0bf285ad5bf Mon Sep 17 00:00:00 2001 From: cparsons Date: Thu, 31 Aug 2017 00:48:01 +0200 Subject: [PATCH] Rollforward #2 of "AppleBinary and AppleStaticLibrary no longer propagate unwrapped ObjcProvider", after changes made to apple bazel rules to be compatible. RELNOTES: None. PiperOrigin-RevId: 167061765 --- .../build/lib/rules/objc/AppleBinary.java | 2 -- .../lib/rules/objc/AppleStaticLibrary.java | 2 -- .../build/lib/rules/objc/AppleBinaryTest.java | 2 +- .../rules/objc/AppleStaticLibraryTest.java | 6 ++++-- .../build/lib/rules/objc/IosTestTest.java | 21 ++++++++++++++++++- .../build/lib/rules/objc/ObjcBinaryTest.java | 2 +- .../build/lib/rules/objc/ObjcLibraryTest.java | 2 +- .../lib/rules/objc/ObjcProtoLibraryTest.java | 13 ++++++++---- .../lib/rules/objc/ObjcRuleTestCase.java | 8 +++++-- 9 files changed, 42 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java index a65a9a553865c9..8e6c2bd426f4fc 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java @@ -167,8 +167,6 @@ public final ConfiguredTarget create(RuleContext ruleContext) objcProviderBuilder.add(MULTI_ARCH_LINKED_BINARIES, outputArtifact); ObjcProvider objcProvider = objcProviderBuilder.build(); - // TODO(cparsons): Stop propagating ObjcProvider directly from this rule. - targetBuilder.addNativeDeclaredProvider(objcProvider); switch (getBinaryType(ruleContext)) { case EXECUTABLE: diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java index 16eef2817039b3..ff3e8f93500586 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java @@ -181,8 +181,6 @@ public final ConfiguredTarget create(RuleContext ruleContext) ObjcProvider objcProvider = objcProviderBuilder.build(); targetBuilder - // TODO(cparsons): Remove ObjcProvider as a direct provider. - .addNativeDeclaredProvider(objcProvider) .addNativeDeclaredProvider( new AppleStaticLibraryProvider( ruleIntermediateArtifacts.combinedArchitectureArchive(), objcProvider)) diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java index 2c4026e67865ee..e9085c8cecbbad 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java @@ -1440,7 +1440,7 @@ public void testLoadableBundleBinaryAddsRpathLinkOptWithBundleLoader() throws Ex @Test public void testCustomModuleMap() throws Exception { - checkCustomModuleMap(RULE_TYPE); + checkCustomModuleMap(RULE_TYPE, true); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java index d76970aa85c095..ca89f67c94501c 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java @@ -149,7 +149,9 @@ public void testAvoidDepsProviders() throws Exception { " resources = [':avoid.png']", ")"); - ObjcProvider provider = providerForTarget("//package:test"); + ObjcProvider provider = getConfiguredTarget("//package:test") + .get(AppleStaticLibraryProvider.SKYLARK_CONSTRUCTOR) + .getDepsObjcProvider(); // Do not remove SDK_FRAMEWORK values in avoid_deps. assertThat(provider.get(ObjcProvider.SDK_FRAMEWORK)) .containsAllOf(new SdkFramework("AvoidSDK"), new SdkFramework("BaseSDK")); @@ -623,4 +625,4 @@ public void testAvoidDepsObjects_avoidCcLibrary() throws Exception { assertThat(Artifact.toRootRelativePaths(action.getInputs())).doesNotContain( "package/libavoidCcLib.a"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java index 7bb3872c317e1d..6c31986a0af530 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java @@ -1167,7 +1167,22 @@ public void testMultiArchUserHeaderSearchPathsUsed() throws Exception { // Usually, an ios_test would depend on apple_binary through a skylark_ios_application in its // 'binary' attribute. Since we don't have skylark_ios_application here, we use the 'deps' // attribute instead. + scratch.file("skylarkstub/BUILD"); + scratch.file("skylarkstub/skylark_stub.bzl", + "def skylark_ios_application_stub_impl(ctx):", + " bin_provider = ctx.attr.binary[apple_common.AppleExecutableBinary]", + " return struct(objc=bin_provider.objc)", + "skylark_ios_application_stub = rule(", + " skylark_ios_application_stub_impl,", + // Both 'binary' and 'deps' are needed because ObjcProtoAspect is applied transitively + // along attribute 'deps' only. + " attrs = {'binary': attr.label(mandatory=True,", + " providers=[apple_common.AppleExecutableBinary])},", + " fragments = ['apple', 'objc'],", + ")"); + scratch.file("x/BUILD", + "load('//skylarkstub:skylark_stub.bzl', 'skylark_ios_application_stub')", "genrule(", " name = 'gen_hdrs',", " outs = ['generated.h'],", @@ -1179,6 +1194,10 @@ public void testMultiArchUserHeaderSearchPathsUsed() throws Exception { " platform_type = 'ios',", " hdrs = ['generated.h'],", ")", + "skylark_ios_application_stub(", + " name = 'stub_application',", + " binary = ':apple_bin',", + ")", "objc_binary(", " name = 'bin',", " srcs = ['bin.m'],", @@ -1192,7 +1211,7 @@ public void testMultiArchUserHeaderSearchPathsUsed() throws Exception { " srcs = ['test.m'],", " xctest = 1,", " xctest_app = ':testApp',", - " deps = [':apple_bin']", + " deps = [':stub_application']", ")"); CommandAction compileAction = compileAction("//x:test", "test.o"); // The genfiles root for child configurations must be present in the compile action so that diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java index 255841d605f912..591eeaca3bb6a8 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java @@ -928,7 +928,7 @@ public void testFilesToCompileOutputGroup() throws Exception { @Test public void testCustomModuleMap() throws Exception { - checkCustomModuleMap(RULE_TYPE); + checkCustomModuleMap(RULE_TYPE, false); } @Test 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 056a607c390eec..074a5560971df3 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 @@ -1564,6 +1564,6 @@ public void testDefaultEnabledFeatureIsUsed() throws Exception { @Test public void testCustomModuleMap() throws Exception { - checkCustomModuleMap(RULE_TYPE); + checkCustomModuleMap(RULE_TYPE, false); } } diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java index 043f21b8cbf7aa..ca872738cac46e 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java @@ -679,12 +679,12 @@ public void testErrorForUsesProtobufWithOptionsFile() throws Exception { @Test public void testModulemapCreatedForNonLinkingTargets() throws Exception { - checkOnlyLibModuleMapsArePresentForTarget("//package:opl_protobuf"); + checkOnlyLibModuleMapsArePresentForTarget("//package:opl_protobuf", false); } @Test public void testModulemapNotCreatedForLinkingTargets() throws Exception { - checkOnlyLibModuleMapsArePresentForTarget("//package:opl_binary"); + checkOnlyLibModuleMapsArePresentForTarget("//package:opl_binary", true); } @Test @@ -760,7 +760,8 @@ private static String sortedJoin(Iterable elements) { return Joiner.on('\n').join(Ordering.natural().immutableSortedCopy(elements)); } - private void checkOnlyLibModuleMapsArePresentForTarget(String target) throws Exception { + private void checkOnlyLibModuleMapsArePresentForTarget(String target, + boolean fromBinary) throws Exception { Artifact libModuleMap = getGenfilesArtifact( "opl_protobuf.modulemaps/module.modulemap", @@ -770,7 +771,11 @@ private void checkOnlyLibModuleMapsArePresentForTarget(String target) throws Exc "protobuf_lib.modulemaps/module.modulemap", getConfiguredTarget("//objcproto:protobuf_lib")); - ObjcProvider provider = providerForTarget(target); + ObjcProvider provider = fromBinary + ? getConfiguredTarget(target) + .get(AppleExecutableBinaryProvider.SKYLARK_CONSTRUCTOR) + .getDepsObjcProvider() + : providerForTarget(target); assertThat(Artifact.toRootRelativePaths(provider.get(ObjcProvider.MODULE_MAP).toSet())) .containsExactlyElementsIn( Artifact.toRootRelativePaths(ImmutableSet.of(libModuleMap, protolibModuleMap))); diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java index 7baa058ad7325e..6051f4ae002923 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java @@ -4892,7 +4892,7 @@ public void checkFilesToCompileOutputGroup(RuleType ruleType) throws Exception { .isEqualTo("a.o"); } - protected void checkCustomModuleMap(RuleType ruleType) throws Exception { + protected void checkCustomModuleMap(RuleType ruleType, boolean fromBinary) throws Exception { useConfiguration("--experimental_objc_enable_module_maps"); ruleType.scratchTarget(scratch, "srcs", "['a.m']", "deps", "['//z:testModuleMap']"); scratch.file("x/a.m"); @@ -4920,7 +4920,11 @@ protected void checkCustomModuleMap(RuleType ruleType) throws Exception { assertThat(Artifact.toExecPaths(provider.get(MODULE_MAP))) .containsExactly("y/module.modulemap"); - provider = providerForTarget("//x:x"); + provider = fromBinary + ? getConfiguredTarget("//x:x") + .get(AppleExecutableBinaryProvider.SKYLARK_CONSTRUCTOR) + .getDepsObjcProvider() + : providerForTarget("//x:x"); assertThat(Artifact.toExecPaths(provider.get(MODULE_MAP))).contains("y/module.modulemap"); }