aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibrary.java
diff options
context:
space:
mode:
authorGravatar Peter Schmitt <schmitt@google.com>2015-05-20 20:03:26 +0000
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2015-05-21 09:50:21 +0000
commitb66898e44d79ef67f856eaeae711bb461564a3c1 (patch)
tree5adcd55d38a04f5111118e9776317bbfc8e1a914 /src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibrary.java
parent9208259df169e46cabdf1102bfc529a915a1581d (diff)
Allow objc_{library,binary} to depend on cc_library.
This is an early version of support for this feature, likely still missing a number of edge cases. However the basic functionality should work. To allow a dependency from objc to cc, the following flags will have to be passed to bazel: --experimental_enable_objc_cc_deps --experimental_disable_java --cpu=ios_i386 --crosstool_top=//tools/objc/crosstool:crosstool The feature is also compatible with --ios_multi_cpus, with the familiar values for --ios_cpu (i386, x86_64, armv7, arm64). However, using this crosstool and any CPU defined in it (legal values are ios_i386, ios_x86_64, ios_armv7, ios_arm64) will make it impossible to use genrules with java make variables in the same build: Obviously they require java support and no that is not available for iOS CPUs. The new flag --experimental_disable_java has not been tested in any circumstances but the one enabled by this CL so use it with caution. This CL does not contain any Xcode support for CC dependencies yet, they will just not show up in the generated Xcode project. -- MOS_MIGRATED_REVID=94116942
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibrary.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibrary.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibrary.java
index 38c07190d1..522a35b7ce 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibrary.java
@@ -24,6 +24,8 @@ import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.packages.Type;
import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory;
+import com.google.devtools.build.lib.rules.cpp.CcLinkParamsProvider;
+import com.google.devtools.build.lib.rules.cpp.CppCompilationContext;
import com.google.devtools.build.lib.rules.objc.ObjcCommon.CompilationAttributes;
import com.google.devtools.build.lib.rules.objc.ObjcCommon.ResourceAttributes;
@@ -68,6 +70,10 @@ public class ObjcLibrary implements RuleConfiguredTargetFactory {
ruleContext.getPrerequisites("bundles", Mode.TARGET, ObjcProvider.class))
.addNonPropagatedDepObjcProviders(ruleContext.getPrerequisites("non_propagated_deps",
Mode.TARGET, ObjcProvider.class))
+ .addDepCcHeaderProviders(
+ ruleContext.getPrerequisites("deps", Mode.TARGET, CppCompilationContext.class))
+ .addDepCcLinkProviders(
+ ruleContext.getPrerequisites("deps", Mode.TARGET, CcLinkParamsProvider.class))
.setIntermediateArtifacts(ObjcRuleClasses.intermediateArtifacts(ruleContext))
.setAlwayslink(alwayslink)
.addExtraImportLibraries(extraImportLibraries)