diff options
author | Cal Peyser <cpeyser@google.com> | 2016-09-09 16:37:35 +0000 |
---|---|---|
committer | Dmitry Lomov <dslomov@google.com> | 2016-09-12 08:54:55 +0000 |
commit | 9d774203ecc2cce5630d0f71088bfb4ae469cc03 (patch) | |
tree | c1983f229321b0e48c76b5a5d7d29ebb1258bf05 /src/main/java/com/google | |
parent | 29bc3fb5066b55c7736a374c716116b6538275be (diff) |
Add missing fields to ObjcCommon for experimental_objc_library.
--
MOS_MIGRATED_REVID=132683208
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ExperimentalObjcLibrary.java | 20 |
1 files changed, 11 insertions, 9 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 e703d0d6f1..b5815879d1 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 @@ -41,6 +41,7 @@ import com.google.devtools.build.lib.rules.cpp.Link.LinkStaticness; import com.google.devtools.build.lib.rules.cpp.Link.LinkTargetType; import com.google.devtools.build.lib.rules.cpp.PrecompiledFiles; import com.google.devtools.build.lib.rules.objc.ObjcCommon.ResourceAttributes; +import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.vfs.PathFragment; import java.util.Collection; @@ -77,7 +78,7 @@ public class ExperimentalObjcLibrary implements RuleConfiguredTargetFactory { IntermediateArtifacts intermediateArtifacts = ObjcRuleClasses.intermediateArtifacts(ruleContext); - ObjcCommon common = common(ruleContext, compilationAttributes, compilationArtifacts); + ObjcCommon common = common(ruleContext); ObjcVariablesExtension variablesExtension = new ObjcVariablesExtension( ruleContext, @@ -241,23 +242,24 @@ public class ExperimentalObjcLibrary implements RuleConfiguredTargetFactory { /** * Constructs an {@link ObjcCommon} instance based on the attributes of the given rule context. */ - private static ObjcCommon common( - RuleContext ruleContext, - CompilationAttributes compilationAttributes, - CompilationArtifacts compilationArtifacts) { + private static ObjcCommon common(RuleContext ruleContext) { return new ObjcCommon.Builder(ruleContext) - .setCompilationAttributes(compilationAttributes) + .setCompilationAttributes( + CompilationAttributes.Builder.fromRuleContext(ruleContext).build()) .setResourceAttributes(new ResourceAttributes(ruleContext)) .addDefines(ruleContext.getTokenizedStringListAttr("defines")) - .setCompilationArtifacts(compilationArtifacts) + .setCompilationArtifacts(CompilationSupport.compilationArtifacts(ruleContext)) .addDeps(ruleContext.getPrerequisites("deps", Mode.TARGET)) + .addRuntimeDeps(ruleContext.getPrerequisites("runtime_deps", Mode.TARGET)) + .addDepObjcProviders( + ruleContext.getPrerequisites("bundles", Mode.TARGET, ObjcProvider.class)) .addNonPropagatedDepObjcProviders( ruleContext.getPrerequisites("non_propagated_deps", Mode.TARGET, ObjcProvider.class)) - .addRuntimeDeps(ruleContext.getPrerequisites("runtime_deps", Mode.TARGET)) .setIntermediateArtifacts(ObjcRuleClasses.intermediateArtifacts(ruleContext)) + .setAlwayslink(ruleContext.attributes().get("alwayslink", Type.BOOLEAN)) .build(); } - + private static ImmutableList<Artifact> getObjFiles( CompilationArtifacts compilationArtifacts, IntermediateArtifacts intermediateArtifacts) { ImmutableList.Builder<Artifact> result = new ImmutableList.Builder<>(); |