diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc')
4 files changed, 30 insertions, 26 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java index 6de440a748..def979fdb3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java @@ -89,9 +89,9 @@ import com.google.devtools.build.lib.rules.apple.AppleToolchain; import com.google.devtools.build.lib.rules.apple.XcodeConfig; import com.google.devtools.build.lib.rules.apple.XcodeConfigProvider; import com.google.devtools.build.lib.rules.cpp.CcCommon; +import com.google.devtools.build.lib.rules.cpp.CcCompilationContextInfo; import com.google.devtools.build.lib.rules.cpp.CcCompilationHelper; import com.google.devtools.build.lib.rules.cpp.CcCompilationHelper.CompilationInfo; -import com.google.devtools.build.lib.rules.cpp.CcCompilationInfo; import com.google.devtools.build.lib.rules.cpp.CcCompilationOutputs; import com.google.devtools.build.lib.rules.cpp.CcLinkingHelper; import com.google.devtools.build.lib.rules.cpp.CcLinkingHelper.LinkingInfo; @@ -446,21 +446,22 @@ public class CompilationSupport { resultLink.addLinkActionInput(linkActionInput); } - CcCompilationInfo.Builder ccCompilationInfoBuilder = new CcCompilationInfo.Builder(ruleContext); - ccCompilationInfoBuilder.mergeDependentCcCompilationInfos( + CcCompilationContextInfo.Builder ccCompilationContextInfoBuilder = + new CcCompilationContextInfo.Builder(ruleContext); + ccCompilationContextInfoBuilder.mergeDependentCcCompilationContextInfos( Arrays.asList( - objcArcCompilationInfo.getCcCompilationInfo(), - nonObjcArcCompilationInfo.getCcCompilationInfo())); - ccCompilationInfoBuilder.setPurpose( + objcArcCompilationInfo.getCcCompilationContextInfo(), + nonObjcArcCompilationInfo.getCcCompilationContextInfo())); + ccCompilationContextInfoBuilder.setPurpose( String.format("%s_merged_arc_non_arc_objc", semantics.getPurpose())); - semantics.setupCcCompilationInfo(ruleContext, ccCompilationInfoBuilder); + semantics.setupCcCompilationContextInfo(ruleContext, ccCompilationContextInfoBuilder); CcCompilationOutputs.Builder compilationOutputsBuilder = new CcCompilationOutputs.Builder(); compilationOutputsBuilder.merge(objcArcCompilationInfo.getCcCompilationOutputs()); compilationOutputsBuilder.merge(nonObjcArcCompilationInfo.getCcCompilationOutputs()); LinkingInfo linkingInfo = - resultLink.link(compilationOutputsBuilder.build(), ccCompilationInfoBuilder.build()); + resultLink.link(compilationOutputsBuilder.build(), ccCompilationContextInfoBuilder.build()); Map<String, NestedSet<Artifact>> mergedOutputGroups = CcCommon.mergeOutputGroups( diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java index 1b1a89d527..d4a26a234d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java @@ -67,7 +67,7 @@ import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTa import com.google.devtools.build.lib.packages.Info; import com.google.devtools.build.lib.packages.NativeProvider; import com.google.devtools.build.lib.rules.apple.AppleToolchain; -import com.google.devtools.build.lib.rules.cpp.CcCompilationInfo; +import com.google.devtools.build.lib.rules.cpp.CcCompilationContextInfo; import com.google.devtools.build.lib.rules.cpp.CcLinkParams; import com.google.devtools.build.lib.rules.cpp.CcLinkParamsInfo; import com.google.devtools.build.lib.rules.cpp.CppFileTypes; @@ -167,7 +167,7 @@ public final class ObjcCommon { private DsymOutputType dsymOutputType; private Optional<Artifact> linkedBinary = Optional.absent(); private Optional<Artifact> linkmapFile = Optional.absent(); - private Iterable<CcCompilationInfo> depCcHeaderProviders = ImmutableList.of(); + private Iterable<CcCompilationContextInfo> depCcHeaderProviders = ImmutableList.of(); private Iterable<CcLinkParamsInfo> depCcLinkProviders = ImmutableList.of(); /** @@ -256,17 +256,18 @@ public final class ObjcCommon { Builder addDeps(List<ConfiguredTargetAndData> deps) { ImmutableList.Builder<ObjcProvider> propagatedObjcDeps = ImmutableList.<ObjcProvider>builder(); - ImmutableList.Builder<CcCompilationInfo> cppDeps = ImmutableList.<CcCompilationInfo>builder(); + ImmutableList.Builder<CcCompilationContextInfo> cppDeps = + ImmutableList.<CcCompilationContextInfo>builder(); ImmutableList.Builder<CcLinkParamsInfo> cppDepLinkParams = ImmutableList.<CcLinkParamsInfo>builder(); for (ConfiguredTargetAndData dep : deps) { ConfiguredTarget depCT = dep.getConfiguredTarget(); addAnyProviders(propagatedObjcDeps, depCT, ObjcProvider.SKYLARK_CONSTRUCTOR); - addAnyProviders(cppDeps, depCT, CcCompilationInfo.PROVIDER); + addAnyProviders(cppDeps, depCT, CcCompilationContextInfo.PROVIDER); if (isCcLibrary(dep)) { cppDepLinkParams.add(depCT.get(CcLinkParamsInfo.PROVIDER)); - addDefines(depCT.get(CcCompilationInfo.PROVIDER).getDefines()); + addDefines(depCT.get(CcCompilationContextInfo.PROVIDER).getDefines()); } } addDepObjcProviders(propagatedObjcDeps.build()); @@ -422,11 +423,11 @@ public final class ObjcCommon { objcProvider.addTransitiveAndPropagate(ObjcProvider.MERGE_ZIP, provider); } - for (CcCompilationInfo headerProvider : depCcHeaderProviders) { + for (CcCompilationContextInfo headerProvider : depCcHeaderProviders) { objcProvider.addAll(HEADER, filterFileset(headerProvider.getDeclaredIncludeSrcs())); objcProvider.addAll(INCLUDE, headerProvider.getIncludeDirs()); // TODO(bazel-team): This pulls in stl via - // CppHelper.mergeToolchainDependentCcCompilationInfo but + // CppHelper.mergeToolchainDependentCcCompilationContextInfo but // probably shouldn't. objcProvider.addAll(INCLUDE_SYSTEM, headerProvider.getSystemIncludeDirs()); objcProvider.addAll(DEFINE, headerProvider.getDefines()); diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java index 53836f4348..9e496fa3ce 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java @@ -24,8 +24,8 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.collect.nestedset.NestedSet; -import com.google.devtools.build.lib.rules.cpp.CcCompilationInfo; -import com.google.devtools.build.lib.rules.cpp.CcCompilationInfo.Builder; +import com.google.devtools.build.lib.rules.cpp.CcCompilationContextInfo; +import com.google.devtools.build.lib.rules.cpp.CcCompilationContextInfo.Builder; import com.google.devtools.build.lib.rules.cpp.CppCompileActionBuilder; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; import com.google.devtools.build.lib.rules.cpp.CppConfiguration.HeadersCheckingMode; @@ -122,12 +122,13 @@ public class ObjcCppSemantics implements CppSemantics { } @Override - public void setupCcCompilationInfo(RuleContext ruleContext, Builder ccCompilationInfoBuilder) { + public void setupCcCompilationContextInfo( + RuleContext ruleContext, Builder ccCompilationContextInfoBuilder) { // The genfiles root of each child configuration must be added to the compile action so that // generated headers can be resolved. for (PathFragment iquotePath : ObjcCommon.userHeaderSearchPaths(objcProvider, ruleContext.getConfiguration())) { - ccCompilationInfoBuilder.addQuoteIncludeDir(iquotePath); + ccCompilationContextInfoBuilder.addQuoteIncludeDir(iquotePath); } } @@ -168,12 +169,13 @@ public class ObjcCppSemantics implements CppSemantics { } /** - * Gets the purpose for the {@code CcCompilationInfo}. + * Gets the purpose for the {@code CcCompilationContextInfo}. * - * @see CcCompilationInfo.Builder#setPurpose + * @see CcCompilationContextInfo.Builder#setPurpose */ public String getPurpose() { - // ProtoSupport creates multiple {@code CcCompilationInfo}s for a single rule, potentially + // ProtoSupport creates multiple {@code CcCompilationContextInfo}s for a single rule, + // potentially // multiple archives per build configuration. This covers that worst case. return "ObjcCppSemantics_build_arch_" + buildConfiguration.getMnemonic() 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 323de180cd..ec1be25f8b 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,7 +24,7 @@ import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTa import com.google.devtools.build.lib.analysis.test.InstrumentedFilesProvider; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; -import com.google.devtools.build.lib.rules.cpp.CcCompilationInfo; +import com.google.devtools.build.lib.rules.cpp.CcCompilationContextInfo; import com.google.devtools.build.lib.rules.cpp.CcLinkParamsInfo; import com.google.devtools.build.lib.rules.objc.ObjcCommon.ResourceAttributes; import com.google.devtools.build.lib.syntax.Type; @@ -92,8 +92,8 @@ public class ObjcLibrary implements RuleConfiguredTargetFactory { J2ObjcEntryClassProvider j2ObjcEntryClassProvider = new J2ObjcEntryClassProvider.Builder() .addTransitive(ruleContext.getPrerequisites("deps", Mode.TARGET, J2ObjcEntryClassProvider.class)).build(); - CcCompilationInfo ccCompilationInfo = - new CcCompilationInfo.Builder(ruleContext) + CcCompilationContextInfo ccCompilationContextInfo = + new CcCompilationContextInfo.Builder(ruleContext) .addDeclaredIncludeSrcs( CompilationAttributes.Builder.fromRuleContext(ruleContext) .build() @@ -103,7 +103,7 @@ public class ObjcLibrary implements RuleConfiguredTargetFactory { return ObjcRuleClasses.ruleConfiguredTarget(ruleContext, filesToBuild.build()) .addNativeDeclaredProvider(common.getObjcProvider()) - .addNativeDeclaredProvider(ccCompilationInfo) + .addNativeDeclaredProvider(ccCompilationContextInfo) .addProvider(J2ObjcEntryClassProvider.class, j2ObjcEntryClassProvider) .addProvider(J2ObjcMappingFileProvider.class, j2ObjcMappingFileProvider) .addProvider( |