commit 2f111920a99368cbe8d2dd7f1a5d586037dbc686
author Googler <noreply@google.com> Tue Feb 28 20:58:45 2017 +0000
committer Yue Gan <yueg@google.com> Wed Mar 01 12:34:15 2017 +0000
tree 4bfc21313fc93ff9b6330ddd0f1a72e9c6707ee9
parent ee61191446829605b303bcfee3f2eddee437c8fc

Convert --use_action_cache to a regular option

RELNOTES: Convert --use_action_cache to a regular option

--
PiperOrigin-RevId: 148804881
MOS_MIGRATED_REVID=148804881

src/main/cpp/blaze.cc

diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index bfb8e15..4240be5 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -482,11 +482,6 @@
   } else {
     result.push_back("--use_custom_exit_code_on_abrupt_exit=false");
   }
-  if (globals->options->use_action_cache) {
-    result.push_back("--use_action_cache=true");
-  } else {
-    result.push_back("--use_action_cache=false");
-  }
 
   // This is only for Blaze reporting purposes; the real interpretation of the
   // jvm flags occurs when we set up the java command line.

src/main/cpp/startup_options.cc

diff --git a/src/main/cpp/startup_options.cc b/src/main/cpp/startup_options.cc
index f7786b4..1254cc2 100644
--- a/src/main/cpp/startup_options.cc
+++ b/src/main/cpp/startup_options.cc
@@ -57,8 +57,7 @@
       invocation_policy(NULL),
       client_debug(false),
       use_custom_exit_code_on_abrupt_exit(true),
-      java_logging_formatter("java.util.logging.SimpleFormatter"),
-      use_action_cache(true) {
+      java_logging_formatter("java.util.logging.SimpleFormatter") {
   bool testing = !blaze::GetEnv("TEST_TMPDIR").empty();
   if (testing) {
     output_root = MakeAbsolute(blaze::GetEnv("TEST_TMPDIR"));
@@ -84,8 +83,7 @@
                      "write_command_log",
                      "watchfs",
                      "client_debug",
-                     "use_custom_exit_code_on_abrupt_exit",
-                     "use_action_cache"};
+                     "use_custom_exit_code_on_abrupt_exit"};
   unary_options = {"output_base", "install_base",
       "output_user_root", "host_jvm_profile", "host_javabase",
       "host_jvm_args", "bazelrc", "blazerc", "io_nice_level",
@@ -285,12 +283,6 @@
   } else if (GetNullaryOption(arg, "--nouse_custom_exit_code_on_abrupt_exit")) {
     use_custom_exit_code_on_abrupt_exit = false;
     option_sources["use_custom_exit_code_on_abrupt_exit"] = rcfile;
-  } else if (GetNullaryOption(arg, "--nouse_action_cache")) {
-    use_action_cache = false;
-    option_sources["use_action_cache"] = rcfile;
-  } else if (GetNullaryOption(arg, "--use_action_cache")) {
-    use_action_cache = true;
-    option_sources["use_action_cache"] = rcfile;
   } else if ((value = GetUnaryOption(
       arg, next_arg, "--connect_timeout_secs")) != NULL) {
     if (!blaze_util::safe_strto32(value, &connect_timeout_secs) ||

src/main/cpp/startup_options.h

diff --git a/src/main/cpp/startup_options.h b/src/main/cpp/startup_options.h
index cddebe3..7bde6e7 100644
--- a/src/main/cpp/startup_options.h
+++ b/src/main/cpp/startup_options.h
@@ -215,9 +215,6 @@
   // Value of the java.util.logging.FileHandler.formatter Java property.
   std::string java_logging_formatter;
 
-  // Whether to use the action cache.
-  bool use_action_cache;
-
  protected:
   // Constructor for subclasses only so that site-specific extensions of this
   // class can override the product name.  The product_name must be the