Replace deprecated get*Fragment calls in CcCompilationHelper.
PiperOrigin-RevId: 336946915
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
index 30b3b2e..654316d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
@@ -362,7 +362,8 @@
ImmutableList.of(CcCompilationHelper.getStlCcCompilationContext(ruleContext)))
.setHeadersCheckingMode(semantics.determineHeadersCheckingMode(ruleContext))
.setCodeCoverageEnabled(CcCompilationHelper.isCodeCoverageEnabled(ruleContext));
- CompilationInfo compilationInfo = compilationHelper.compile(ruleContext::ruleError);
+ CompilationInfo compilationInfo =
+ compilationHelper.compile(ruleContext, ruleContext::ruleError);
CcCompilationContext ccCompilationContext = compilationInfo.getCcCompilationContext();
CcCompilationOutputs precompiledFileObjects =
CcCompilationOutputs.builder()
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
index ecaa83c..5ed89dd 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
@@ -754,14 +754,14 @@
*
* @throws RuleErrorException
*/
- public CompilationInfo compile(Consumer<String> errorReporter)
+ public CompilationInfo compile(RuleContext ruleContext, Consumer<String> errorReporter)
throws RuleErrorException, InterruptedException {
if (!generatePicAction && !generateNoPicAction) {
ruleErrorConsumer.ruleError("Either PIC or no PIC actions have to be created.");
}
- ccCompilationContext = initializeCcCompilationContext();
+ ccCompilationContext = initializeCcCompilationContext(ruleContext);
boolean compileHeaderModules = featureConfiguration.isEnabled(CppRuleClasses.HEADER_MODULES);
Preconditions.checkState(
@@ -978,7 +978,8 @@
}
/** Create {@code CcCompilationContext} for cc compile action from generated inputs. */
- private CcCompilationContext initializeCcCompilationContext() throws InterruptedException {
+ private CcCompilationContext initializeCcCompilationContext(RuleContext ruleContext)
+ throws InterruptedException {
CcCompilationContext.Builder ccCompilationContextBuilder =
CcCompilationContext.builder(actionConstructionContext, configuration, label);
@@ -999,9 +1000,9 @@
PathFragment repositoryPath = repositoryName.getExecPath(siblingRepositoryLayout);
ccCompilationContextBuilder.addQuoteIncludeDir(repositoryPath);
ccCompilationContextBuilder.addQuoteIncludeDir(
- configuration.getGenfilesFragment(repositoryName).getRelative(repositoryPath));
+ ruleContext.getGenfilesFragment().getRelative(repositoryPath));
ccCompilationContextBuilder.addQuoteIncludeDir(
- configuration.getBinFragment(repositoryName).getRelative(repositoryPath));
+ ruleContext.getBinFragment().getRelative(repositoryPath));
ccCompilationContextBuilder.addSystemIncludeDirs(systemIncludeDirs);
ccCompilationContextBuilder.addFrameworkIncludeDirs(frameworkIncludeDirs);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java
index d2b176e..387f8a8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java
@@ -167,7 +167,7 @@
.setHeadersCheckingMode(HeadersCheckingMode.STRICT)
.setCodeCoverageEnabled(CcCompilationHelper.isCodeCoverageEnabled(ruleContext))
.setPurpose(common.getPurpose(semantics))
- .compile(ruleContext::ruleError);
+ .compile(ruleContext, ruleContext::ruleError);
Map<String, NestedSet<Artifact>> outputGroups =
CcCompilationHelper.buildOutputGroups(compilationInfo.getCcCompilationOutputs());
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
index 6aca8e5..8066212 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
@@ -306,7 +306,8 @@
Code.SOURCE_FILES_MISSING));
}
- CompilationInfo compilationInfo = compilationHelper.compile(ruleContext::ruleError);
+ CompilationInfo compilationInfo =
+ compilationHelper.compile(ruleContext, ruleContext::ruleError);
CcCompilationOutputs precompiledFilesObjects =
CcCompilationOutputs.builder()
.addObjectFiles(precompiledFiles.getObjectFiles(/* usePic= */ true))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
index f747701..d342b27 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
@@ -24,6 +24,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
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.analysis.config.BuildOptions;
import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo;
@@ -1845,7 +1846,8 @@
helper.setStripIncludePrefix(stripIncludePrefix);
}
try {
- CompilationInfo compilationInfo = helper.compile(actions.getRuleContext()::ruleError);
+ RuleContext ruleContext = actions.getRuleContext();
+ CompilationInfo compilationInfo = helper.compile(ruleContext, ruleContext::ruleError);
return Tuple.of(
compilationInfo.getCcCompilationContext(), compilationInfo.getCcCompilationOutputs());
} catch (RuleErrorException e) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
index 3ec8a35..1e65eb7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
@@ -214,7 +214,8 @@
filesBuilder.addAll(outputs);
createProtoCompileAction(outputs);
- CompilationInfo compilationInfo = compilationHelper.compile(ruleContext::ruleError);
+ CompilationInfo compilationInfo =
+ compilationHelper.compile(ruleContext, ruleContext::ruleError);
CcCompilationOutputs ccCompilationOutputs = compilationInfo.getCcCompilationOutputs();
CcLinkingHelper ccLinkingHelper = initializeLinkingHelper(featureConfiguration, deps);
if (ccToolchain(ruleContext).supportsInterfaceSharedLibraries(featureConfiguration)) {
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 e67a56c..675d6d1 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
@@ -315,7 +315,7 @@
result.doNotGenerateModuleMap();
}
- return result.compile(ruleContext::ruleError);
+ return result.compile(ruleContext, ruleContext::ruleError);
}
private static class CompilationResult {
