diff options
author | 2016-11-01 15:25:59 +0000 | |
---|---|---|
committer | 2016-11-02 08:26:43 +0000 | |
commit | 2bd36c62696288d33504859eb780f4214b9d529b (patch) | |
tree | 2dd65fd4b4e09e5821fc370609682bb3c8a9b6e4 | |
parent | e44623714095a6e613f33955feb4b80c58a2ff21 (diff) |
experimental_objc_library relies on ObjcProvider for compilation data, exporting only CcLinkParamsProvider to provide cc-interop (see the current objc_library implementation).
This allows experimental_objc_library to take advantage of ObjcProvider's direct-deps semantics for protos.
--
MOS_MIGRATED_REVID=137826198
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java index eeff4056b9..3746894240 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java @@ -23,6 +23,7 @@ import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.TransitiveInfoProviderMap; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory; +import com.google.devtools.build.lib.rules.cpp.CcLinkParamsProvider; import com.google.devtools.build.lib.rules.objc.ObjcCommon.ResourceAttributes; import com.google.devtools.build.lib.syntax.Type; @@ -83,7 +84,7 @@ public class ExperimentalObjcLibrary implements RuleConfiguredTargetFactory { return ObjcRuleClasses.ruleConfiguredTarget(ruleContext, filesToBuild.build()) .addProvider(ObjcProvider.class, common.getObjcProvider()) - .addProviders(compilationProviders) + .addProvider(compilationProviders.getProvider(CcLinkParamsProvider.class)) .addProvider(ObjcProvider.class, common.getObjcProvider()) .addProvider(XcodeProvider.class, xcodeProviderBuilder.build()) .build(); |