commit f8b57c5ff6733bffa056abfc91eca18e9273b95d
author juliexxia <juliexxia@google.com> Thu Dec 21 11:37:46 2017 -0800
committer Copybara-Service <copybara-piper@google.com> Thu Dec 21 11:40:11 2017 -0800
tree c4fa0f303328cf8410e61ad9433e95d484a43e5c
parent 84bf5dbebc002ac30159149df97b8206649e9449

Consolidate instances of the --loading_phase_threads flag.

RELNOTES: None.
PiperOrigin-RevId: 179838936

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

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 8261c7c..816dba9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -167,17 +167,6 @@
    */
   public static class Options extends OptionsBase {
     @Option(
-      name = "loading_phase_threads",
-      defaultValue = "-1",
-      category = "what",
-      converter = LoadingPhaseThreadCountConverter.class,
-      documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-      effectTags = {OptionEffectTag.UNKNOWN},
-      help = "Number of parallel threads to use for the loading/analysis phase."
-    )
-    public int loadingPhaseThreads;
-
-    @Option(
       name = "analysis_warnings_as_errors",
       deprecationWarning =
           "analysis_warnings_as_errors is now a no-op and will be removed in"
@@ -465,6 +454,7 @@
       List<String> aspects,
       Options viewOptions,
       boolean keepGoing,
+      int loadingPhaseThreads,
       TopLevelArtifactContext topLevelOptions,
       ExtendedEventHandler eventHandler,
       EventBus eventBus)
@@ -579,12 +569,7 @@
     try {
       skyframeAnalysisResult =
           skyframeBuildView.configureTargets(
-              eventHandler,
-              topLevelCtKeys,
-              aspectKeys,
-              eventBus,
-              keepGoing,
-              viewOptions.loadingPhaseThreads);
+              eventHandler, topLevelCtKeys, aspectKeys, eventBus, keepGoing, loadingPhaseThreads);
       setArtifactRoots(skyframeAnalysisResult.getPackageRoots());
     } finally {
       skyframeBuildView.clearInvalidatedConfiguredTargets();