Skip to content

Commit ca7d260

Browse files
lberkicopybara-github
authored andcommitted
Do all initialization in forAnalysis() instead of constructors and set the top-level configuration options from an argument to forAnalysis().
This lets us decouple RemoteAnalysisCacheManager and RemoteAnalysisCacheDeps and remove quite a few constructor parameters and fields. RELNOTES: None. PiperOrigin-RevId: 875870230 Change-Id: I8dc8cc034b842e568d319c2017a8013597ad83c5
1 parent c755b58 commit ca7d260

File tree

5 files changed

+106
-174
lines changed

5 files changed

+106
-174
lines changed

src/main/java/com/google/devtools/build/lib/analysis/BuildView.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,6 @@ public AnalysisResult update(
329329
if (buildConfigurationsCreatedCallback != null) {
330330
buildConfigurationsCreatedCallback.run(topLevelConfig);
331331
}
332-
if (remoteAnalysisCachingDependenciesProvider.mode().requiresBackendConnectivity()) {
333-
remoteAnalysisCachingDependenciesProvider.setTopLevelBuildOptions(
334-
topLevelConfigurationTrimmedOfTestOptions);
335-
}
336332
if (remoteAnalysisCachingDependenciesProvider.mode() == RemoteAnalysisCacheMode.DOWNLOAD) {
337333
try (SilentCloseable c = Profiler.instance().profile("skycache.metadataQuery")) {
338334
remoteAnalysisCachingDependenciesProvider.queryMetadataAndMaybeBailout();

src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import com.google.devtools.build.lib.actions.TestExecException;
3737
import com.google.devtools.build.lib.analysis.AnalysisAndExecutionResult;
3838
import com.google.devtools.build.lib.analysis.AnalysisResult;
39+
import com.google.devtools.build.lib.analysis.BuildView;
3940
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
4041
import com.google.devtools.build.lib.analysis.ViewCreationFailedException;
4142
import com.google.devtools.build.lib.analysis.actions.TemplateExpansionException;
@@ -364,6 +365,8 @@ public void buildTargets(
364365
env,
365366
projectEvaluationResult.activeDirectoriesMatcher(),
366367
targetPatternPhaseValue.getTargetLabels(),
368+
BuildView.getTopLevelConfigurationTrimmedOfTestOptions(
369+
buildOptions, env.getReporter()),
367370
request.getUserOptions(),
368371
projectEvaluationResult.buildOptions());
369372
analysisCachingDeps = analysisDeps.deps();

src/main/java/com/google/devtools/build/lib/skyframe/serialization/analysis/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ java_library(
3838
":remote_analysis_caching_server_state",
3939
":remote_analysis_json_log_writer",
4040
":remote_analysis_metadata_writer",
41-
"//src/main/java/com/google/devtools/build/lib/analysis/config:build_options",
4241
"//src/main/java/com/google/devtools/build/lib/cmdline",
4342
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
4443
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization:frontier_node_version",

0 commit comments

Comments
 (0)