Adds some notes about --batch flag.

--
MOS_MIGRATED_REVID=89348225

2 files changed, 3 insertions, 0 deletions

diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index 01074c7d28..d4339e5e9a 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -302,6 +302,8 @@ static vector<string> GetArgumentArray() {
     result.push_back("--max_idle_secs");
     result.push_back(std::to_string(globals->options.max_idle_secs));
   } else {
+    // --batch must come first in the arguments to Java main() because
+    // the code expects it to be at args[0] if it's been set.
     result.push_back("--batch");
   }
   result.push_back("--install_base=" + globals->options.install_base);
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index 9567aa90ff..868f454579 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -1074,6 +1074,7 @@ public final class BlazeRuntime {
   public static void main(Iterable<Class<? extends BlazeModule>> moduleClasses, String[] args) {
     setupUncaughtHandler(args);
     List<BlazeModule> modules = createModules(moduleClasses);
+    // blaze.cc will put --batch first if the user set it.
     if (args.length >= 1 && args[0].equals("--batch")) {
       // Run Blaze in batch mode.
       System.exit(batchMain(modules, args));