Cleanup crosstools from legacy

In this cl I'm removing:
* Any trace of header preprocessing, removed from blaze in https://github.com/bazelbuild/bazel/commit/26aaea260d970e2022a7bdc911a01aa3679e0f3a
* copts build variable, removed long time ago in https://github.com/bazelbuild/bazel/commit/f322ba774727597b3238c33929c7ef2071f134b4
* is_cc_test_link_action is renamed to is_cc_test

RELNOTES: None.
PiperOrigin-RevId: 202939782

2 files changed, 0 insertions, 427 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL b/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL
index abedb0cb24..645830faed 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL
@@ -213,7 +213,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -623,7 +622,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -664,7 +662,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-executable"
@@ -684,7 +681,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -702,7 +698,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -720,7 +715,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -790,7 +784,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -838,7 +831,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       flag_group {
         flag: "-MD"
@@ -895,7 +887,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -916,7 +907,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "clif-match"
       action: "objc-compile"
@@ -1142,7 +1132,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -1164,7 +1153,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
@@ -1184,7 +1172,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -1224,7 +1211,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -1245,7 +1231,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -1429,26 +1414,6 @@ toolchain {
     implies: "compiler_output_flags"
   }
   action_config {
-    config_name: "c++-header-preprocessing"
-    action_name: "c++-header-preprocessing"
-    tool {
-      tool_path: "mac/wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "preprocessor_defines"
-    implies: "include_system_dirs"
-    implies: "version_min"
-    implies: "objc_arc"
-    implies: "no_objc_arc"
-    implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "sysroot"
-    implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
-  }
-  action_config {
     config_name: "objc-compile"
     action_name: "objc-compile"
     tool {
@@ -1962,7 +1927,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -2372,7 +2336,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -2413,7 +2376,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-executable"
@@ -2433,7 +2395,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -2451,7 +2412,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -2469,7 +2429,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -2539,7 +2498,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -2587,7 +2545,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       flag_group {
         flag: "-MD"
@@ -2644,7 +2601,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -2665,7 +2621,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "clif-match"
       action: "objc-compile"
@@ -2891,7 +2846,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -2913,7 +2867,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
@@ -2933,7 +2886,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -2973,7 +2925,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -2994,7 +2945,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -3178,26 +3128,6 @@ toolchain {
     implies: "compiler_output_flags"
   }
   action_config {
-    config_name: "c++-header-preprocessing"
-    action_name: "c++-header-preprocessing"
-    tool {
-      tool_path: "mac/wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "preprocessor_defines"
-    implies: "include_system_dirs"
-    implies: "version_min"
-    implies: "objc_arc"
-    implies: "no_objc_arc"
-    implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "sysroot"
-    implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
-  }
-  action_config {
     config_name: "objc-compile"
     action_name: "objc-compile"
     tool {
@@ -3706,7 +3636,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -4116,7 +4045,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -4157,7 +4085,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-executable"
@@ -4177,7 +4104,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -4195,7 +4121,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -4213,7 +4138,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -4283,7 +4207,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -4331,7 +4254,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       flag_group {
         flag: "-MD"
@@ -4388,7 +4310,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -4409,7 +4330,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "clif-match"
       action: "objc-compile"
@@ -4635,7 +4555,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -4657,7 +4576,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
@@ -4677,7 +4595,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -4717,7 +4634,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -4738,7 +4654,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -4922,26 +4837,6 @@ toolchain {
     implies: "compiler_output_flags"
   }
   action_config {
-    config_name: "c++-header-preprocessing"
-    action_name: "c++-header-preprocessing"
-    tool {
-      tool_path: "mac/wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "preprocessor_defines"
-    implies: "include_system_dirs"
-    implies: "version_min"
-    implies: "objc_arc"
-    implies: "no_objc_arc"
-    implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "sysroot"
-    implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
-  }
-  action_config {
     config_name: "objc-compile"
     action_name: "objc-compile"
     tool {
@@ -5450,7 +5345,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -5860,7 +5754,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -5901,7 +5794,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-executable"
@@ -5921,7 +5813,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -5939,7 +5830,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -5957,7 +5847,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -6027,7 +5916,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -6075,7 +5963,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       flag_group {
         flag: "-MD"
@@ -6132,7 +6019,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -6153,7 +6039,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "clif-match"
       action: "objc-compile"
@@ -6379,7 +6264,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -6401,7 +6285,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
@@ -6421,7 +6304,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -6461,7 +6343,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -6482,7 +6363,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -6666,26 +6546,6 @@ toolchain {
     implies: "compiler_output_flags"
   }
   action_config {
-    config_name: "c++-header-preprocessing"
-    action_name: "c++-header-preprocessing"
-    tool {
-      tool_path: "mac/wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "preprocessor_defines"
-    implies: "include_system_dirs"
-    implies: "version_min"
-    implies: "objc_arc"
-    implies: "no_objc_arc"
-    implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "sysroot"
-    implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
-  }
-  action_config {
     config_name: "objc-compile"
     action_name: "objc-compile"
     tool {
@@ -7198,7 +7058,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -7608,7 +7467,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -7649,7 +7507,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-executable"
@@ -7669,7 +7526,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -7687,7 +7543,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -7705,7 +7560,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -7775,7 +7629,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -7823,7 +7676,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       flag_group {
         flag: "-MD"
@@ -7880,7 +7732,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -7901,7 +7752,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "clif-match"
       action: "objc-compile"
@@ -8131,7 +7981,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -8153,7 +8002,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
@@ -8173,7 +8021,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -8213,7 +8060,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -8234,7 +8080,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -8418,26 +8263,6 @@ toolchain {
     implies: "compiler_output_flags"
   }
   action_config {
-    config_name: "c++-header-preprocessing"
-    action_name: "c++-header-preprocessing"
-    tool {
-      tool_path: "iossim/wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "preprocessor_defines"
-    implies: "include_system_dirs"
-    implies: "version_min"
-    implies: "objc_arc"
-    implies: "no_objc_arc"
-    implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "sysroot"
-    implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
-  }
-  action_config {
     config_name: "objc-compile"
     action_name: "objc-compile"
     tool {
@@ -8952,7 +8777,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -9362,7 +9186,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -9403,7 +9226,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-executable"
@@ -9425,7 +9247,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -9443,7 +9264,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -9461,7 +9281,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -9531,7 +9350,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -9579,7 +9397,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       flag_group {
         flag: "-MD"
@@ -9636,7 +9453,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -9657,7 +9473,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "clif-match"
       action: "objc-compile"
@@ -9887,7 +9702,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -9909,7 +9723,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
@@ -9929,7 +9742,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -9969,7 +9781,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -9990,7 +9801,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -10174,26 +9984,6 @@ toolchain {
     implies: "compiler_output_flags"
   }
   action_config {
-    config_name: "c++-header-preprocessing"
-    action_name: "c++-header-preprocessing"
-    tool {
-      tool_path: "watchsim/wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "preprocessor_defines"
-    implies: "include_system_dirs"
-    implies: "version_min"
-    implies: "objc_arc"
-    implies: "no_objc_arc"
-    implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "sysroot"
-    implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
-  }
-  action_config {
     config_name: "objc-compile"
     action_name: "objc-compile"
     tool {
@@ -10709,7 +10499,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -11119,7 +10908,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -11160,7 +10948,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-executable"
@@ -11180,7 +10967,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -11198,7 +10984,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -11216,7 +11001,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -11286,7 +11070,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -11334,7 +11117,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       flag_group {
         flag: "-MD"
@@ -11391,7 +11173,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -11412,7 +11193,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "clif-match"
       action: "objc-compile"
@@ -11666,7 +11446,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -11688,7 +11467,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
@@ -11708,7 +11486,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -11748,7 +11525,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -11769,7 +11545,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -11957,27 +11732,6 @@ toolchain {
     implies: "unfiltered_cxx_flags"
   }
   action_config {
-    config_name: "c++-header-preprocessing"
-    action_name: "c++-header-preprocessing"
-    tool {
-      tool_path: "tvsim/wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "preprocessor_defines"
-    implies: "include_system_dirs"
-    implies: "version_min"
-    implies: "objc_arc"
-    implies: "no_objc_arc"
-    implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "sysroot"
-    implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
-    implies: "unfiltered_cxx_flags"
-  }
-  action_config {
     config_name: "objc-compile"
     action_name: "objc-compile"
     tool {
@@ -12494,7 +12248,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -12904,7 +12657,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -12945,7 +12697,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-executable"
@@ -12965,7 +12716,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -12983,7 +12733,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -13001,7 +12750,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -13071,7 +12819,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -13119,7 +12866,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       flag_group {
         flag: "-MD"
@@ -13176,7 +12922,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -13197,7 +12942,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "clif-match"
       action: "objc-compile"
@@ -13427,7 +13171,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -13449,7 +13192,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
@@ -13469,7 +13211,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -13509,7 +13250,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -13530,7 +13270,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -13714,26 +13453,6 @@ toolchain {
     implies: "compiler_output_flags"
   }
   action_config {
-    config_name: "c++-header-preprocessing"
-    action_name: "c++-header-preprocessing"
-    tool {
-      tool_path: "iossim/wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "preprocessor_defines"
-    implies: "include_system_dirs"
-    implies: "version_min"
-    implies: "objc_arc"
-    implies: "no_objc_arc"
-    implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "sysroot"
-    implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
-  }
-  action_config {
     config_name: "objc-compile"
     action_name: "objc-compile"
     tool {
@@ -14248,7 +13967,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -14658,7 +14376,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -14699,7 +14416,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-executable"
@@ -14719,7 +14435,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -14737,7 +14452,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -14755,7 +14469,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -14825,7 +14538,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -14873,7 +14585,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       flag_group {
         flag: "-MD"
@@ -14930,7 +14641,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -14951,7 +14661,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "clif-match"
       action: "objc-compile"
@@ -15203,7 +14912,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -15225,7 +14933,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
@@ -15245,7 +14952,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -15285,7 +14991,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -15306,7 +15011,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -15490,26 +15194,6 @@ toolchain {
     implies: "compiler_output_flags"
   }
   action_config {
-    config_name: "c++-header-preprocessing"
-    action_name: "c++-header-preprocessing"
-    tool {
-      tool_path: "ios/wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "preprocessor_defines"
-    implies: "include_system_dirs"
-    implies: "version_min"
-    implies: "objc_arc"
-    implies: "no_objc_arc"
-    implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "sysroot"
-    implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
-  }
-  action_config {
     config_name: "objc-compile"
     action_name: "objc-compile"
     tool {
@@ -16022,7 +15706,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -16432,7 +16115,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -16473,7 +16155,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-executable"
@@ -16495,7 +16176,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -16513,7 +16193,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -16531,7 +16210,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -16601,7 +16279,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -16649,7 +16326,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       flag_group {
         flag: "-MD"
@@ -16706,7 +16382,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -16727,7 +16402,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "clif-match"
       action: "objc-compile"
@@ -16979,7 +16653,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -17001,7 +16674,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
@@ -17021,7 +16693,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -17061,7 +16732,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -17082,7 +16752,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -17266,26 +16935,6 @@ toolchain {
     implies: "compiler_output_flags"
   }
   action_config {
-    config_name: "c++-header-preprocessing"
-    action_name: "c++-header-preprocessing"
-    tool {
-      tool_path: "watchos/wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "preprocessor_defines"
-    implies: "include_system_dirs"
-    implies: "version_min"
-    implies: "objc_arc"
-    implies: "no_objc_arc"
-    implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "sysroot"
-    implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
-  }
-  action_config {
     config_name: "objc-compile"
     action_name: "objc-compile"
     tool {
@@ -17799,7 +17448,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -18209,7 +17857,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -18250,7 +17897,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-executable"
@@ -18270,7 +17916,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -18288,7 +17933,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -18306,7 +17950,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -18376,7 +18019,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -18424,7 +18066,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       flag_group {
         flag: "-MD"
@@ -18481,7 +18122,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -18502,7 +18142,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "clif-match"
       action: "objc-compile"
@@ -18778,7 +18417,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -18800,7 +18438,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
@@ -18820,7 +18457,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -18860,7 +18496,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -18881,7 +18516,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -19069,27 +18703,6 @@ toolchain {
     implies: "unfiltered_cxx_flags"
   }
   action_config {
-    config_name: "c++-header-preprocessing"
-    action_name: "c++-header-preprocessing"
-    tool {
-      tool_path: "tvos/wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "preprocessor_defines"
-    implies: "include_system_dirs"
-    implies: "version_min"
-    implies: "objc_arc"
-    implies: "no_objc_arc"
-    implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "sysroot"
-    implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
-    implies: "unfiltered_cxx_flags"
-  }
-  action_config {
     config_name: "objc-compile"
     action_name: "objc-compile"
     tool {
@@ -19604,7 +19217,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -20014,7 +19626,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -20055,7 +19666,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-executable"
@@ -20075,7 +19685,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -20093,7 +19702,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -20111,7 +19719,6 @@ toolchain {
       action: "c++-compile"
       action: "c++-module-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "assemble"
       action: "preprocess-assemble"
       action: "objc-compile"
@@ -20181,7 +19788,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -20229,7 +19835,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       flag_group {
         flag: "-MD"
@@ -20286,7 +19891,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
@@ -20307,7 +19911,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "clif-match"
       action: "objc-compile"
@@ -20559,7 +20162,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -20581,7 +20183,6 @@ toolchain {
       action: "c++-module-compile"
       action: "objc-compile"
       action: "objc++-compile"
-      action: "c++-header-preprocessing"
       action: "c++-header-parsing"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
@@ -20601,7 +20202,6 @@ toolchain {
       action: "c-compile"
       action: "c++-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -20641,7 +20241,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -20662,7 +20261,6 @@ toolchain {
       action: "c++-compile"
       action: "linkstamp-compile"
       action: "c++-header-parsing"
-      action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
       action: "objc-compile"
@@ -20846,26 +20444,6 @@ toolchain {
     implies: "compiler_output_flags"
   }
   action_config {
-    config_name: "c++-header-preprocessing"
-    action_name: "c++-header-preprocessing"
-    tool {
-      tool_path: "ios/wrapped_clang"
-      execution_requirement: "requires-darwin"
-    }
-    implies: "preprocessor_defines"
-    implies: "include_system_dirs"
-    implies: "version_min"
-    implies: "objc_arc"
-    implies: "no_objc_arc"
-    implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "sysroot"
-    implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
-  }
-  action_config {
     config_name: "objc-compile"
     action_name: "objc-compile"
     tool {
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
index 6fda1b5c93..6e55a3a2d1 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
@@ -102,7 +102,6 @@ public abstract class MockCcSupport {
           + "    action: 'c-compile'"
           + "    action: 'c++-compile'"
           + "    action: 'c++-header-parsing'"
-          + "    action: 'c++-header-preprocessing'"
           + "    action: 'c++-module-compile'"
           + "    flag_group {"
           + "      iterate_over: 'dependent_module_map_files'"
@@ -145,7 +144,6 @@ public abstract class MockCcSupport {
           + "    action: 'c-compile'"
           + "    action: 'c++-compile'"
           + "    action: 'c++-header-parsing'"
-          + "    action: 'c++-header-preprocessing'"
           + "    action: 'c++-module-compile'"
           + "    flag_group {"
           + "      flag: 'module_name:%{module_name}'"
@@ -159,7 +157,6 @@ public abstract class MockCcSupport {
           + "    action: 'c-compile'"
           + "    action: 'c++-compile'"
           + "    action: 'c++-header-parsing'"
-          + "    action: 'c++-header-preprocessing'"
           + "    action: 'c++-modules-compile'"
           + "    flag_group {"
           + "      iterate_over: 'module_files'"
@@ -184,7 +181,6 @@ public abstract class MockCcSupport {
           + "    action: 'c-compile'"
           + "    action: 'c++-compile'"
           + "    action: 'c++-header-parsing'"
-          + "    action: 'c++-header-preprocessing'"
           + "    action: 'c++-module-compile'"
           + "    env_entry {"
           + "      key: 'cat'"
@@ -198,7 +194,6 @@ public abstract class MockCcSupport {
           + "    action: 'c-compile'"
           + "    action: 'c++-compile'"
           + "    action: 'c++-header-parsing'"
-          + "    action: 'c++-header-preprocessing'"
           + "    action: 'c++-module-compile'"
           + "    env_entry {"
           + "      key: 'module'"