aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/buildtool
diff options
context:
space:
mode:
authorGravatar ulfjack <ulfjack@google.com>2018-06-12 04:56:24 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-06-12 04:57:48 -0700
commitede315264b2191baf76d4cb76bbcf5db85da2630 (patch)
treefa8c1c7435d3893f014e7c93cbfac9ed815faf49 /src/main/java/com/google/devtools/build/lib/buildtool
parent6abc7497941dd81c27674d6636090867ea13101f (diff)
Split TargetPatternEvaluator into two interfaces
- the TargetPatternPreloader is still used for query in all its forms - the remaining TargetPatternEvaluator part is no longer used except in tests - also make both implementations stateless and pass the offset to the methods instead; note that they both modify the underlying skyframe graph, so there are side effects to the calls even if there's no direct state anymore The intent is to migrate the relevant tests to LoadingPhaseRunnerTest (which could also now be renamed since it's not doing a loading phase), and then delete the TargetPatternEvaluator interface. This depends on the previous commit that removed the last direct use of TPE from an internal command. PiperOrigin-RevId: 200198067
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/buildtool')
-rw-r--r--src/main/java/com/google/devtools/build/lib/buildtool/CqueryBuildTool.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/CqueryBuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/CqueryBuildTool.java
index 2bdd2b7750..1b9628e952 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/CqueryBuildTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/CqueryBuildTool.java
@@ -47,7 +47,7 @@ public class CqueryBuildTool extends PostAnalysisQueryBuildTool {
extraFunctions,
targetConfig,
hostConfiguration,
- env.newTargetPatternEvaluator().getOffset(),
+ env.getRelativeWorkingDirectory().getPathString(),
env.getPackageManager().getPackagePath(),
() -> walkableGraph,
cqueryOptions);