Automated rollback of commit f26e8694ae78599b3e2004e3360eaf3443fa53a6.

*** Reason for rollback ***

Breaks clang_tidy.

*** Original change description ***

Introduce -c source_file -o output_file build variables

Prior to this cl CompileCommandLine would (almost) unconditionally emit -c and
-o flags. This cl removes this logic and relies on crosstool to emit these
flags. This is another small step towards platform independent C++ rules.

Memory use is not affected, since the build variables used by this cl are already
exposed, this cl just forces crosstools to use it.

RELNOTES: None.
PiperOrigin-RevId: 168834576

1 files changed, 0 insertions, 700 deletions

diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl
index 3b16480877..8abffa5cd7 100644
--- a/tools/osx/crosstool/CROSSTOOL.tpl
+++ b/tools/osx/crosstool/CROSSTOOL.tpl
@@ -1128,58 +1128,6 @@ toolchain {
       expand_if_all_available: "linker_param_file"
     }
   }
-  feature {
-    name: "compiler_input_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-c"
-        flag: "%{source_file}"
-      }
-      expand_if_all_available: "source_file"
-    }
-  }
-  feature {
-    name: "compiler_output_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-o"
-        flag: "%{output_object_file}"
-        expand_if_all_available: "output_object_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_assembly_file}"
-        flag: "-S"
-        expand_if_all_available: "output_assembly_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_preprocess_file}"
-        flag: "-E"
-        expand_if_all_available: "output_preprocess_file"
-      }
-    }
-  }
   action_config {
     config_name: "strip"
     action_name: "strip"
@@ -1234,8 +1182,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-compile"
@@ -1254,8 +1200,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -1274,8 +1218,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -1294,8 +1236,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -1314,8 +1254,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-compile"
@@ -1330,8 +1268,6 @@ toolchain {
         flag: "x86_64"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "objc_actions"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
@@ -1362,8 +1298,6 @@ toolchain {
         flag: "-std=gnu++11"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
     implies: "framework_paths"
@@ -1393,8 +1327,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -1413,8 +1345,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-archive"
@@ -2793,58 +2723,6 @@ toolchain {
       expand_if_all_available: "linker_param_file"
     }
   }
-  feature {
-    name: "compiler_input_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-c"
-        flag: "%{source_file}"
-      }
-      expand_if_all_available: "source_file"
-    }
-  }
-  feature {
-    name: "compiler_output_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-o"
-        flag: "%{output_object_file}"
-        expand_if_all_available: "output_object_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_assembly_file}"
-        flag: "-S"
-        expand_if_all_available: "output_assembly_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_preprocess_file}"
-        flag: "-E"
-        expand_if_all_available: "output_preprocess_file"
-      }
-    }
-  }
   action_config {
     config_name: "strip"
     action_name: "strip"
@@ -2899,8 +2777,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-compile"
@@ -2919,8 +2795,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -2939,8 +2813,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -2959,8 +2831,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -2979,8 +2849,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-compile"
@@ -2995,8 +2863,6 @@ toolchain {
         flag: "x86_64"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "objc_actions"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
@@ -3028,8 +2894,6 @@ toolchain {
         flag: "-std=gnu++11"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
     implies: "framework_paths"
@@ -3060,8 +2924,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -3080,8 +2942,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-archive"
@@ -4462,58 +4322,6 @@ toolchain {
       expand_if_all_available: "linker_param_file"
     }
   }
-  feature {
-    name: "compiler_input_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-c"
-        flag: "%{source_file}"
-      }
-      expand_if_all_available: "source_file"
-    }
-  }
-  feature {
-    name: "compiler_output_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-o"
-        flag: "%{output_object_file}"
-        expand_if_all_available: "output_object_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_assembly_file}"
-        flag: "-S"
-        expand_if_all_available: "output_assembly_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_preprocess_file}"
-        flag: "-E"
-        expand_if_all_available: "output_preprocess_file"
-      }
-    }
-  }
   action_config {
     config_name: "strip"
     action_name: "strip"
@@ -4568,8 +4376,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-compile"
@@ -4588,8 +4394,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -4608,8 +4412,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -4628,8 +4430,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -4648,8 +4448,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-compile"
@@ -4664,8 +4462,6 @@ toolchain {
         flag: "i386"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "objc_actions"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
@@ -4697,8 +4493,6 @@ toolchain {
         flag: "-std=gnu++11"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
     implies: "framework_paths"
@@ -4729,8 +4523,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -4749,8 +4541,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-archive"
@@ -6153,58 +5943,6 @@ toolchain {
       expand_if_all_available: "linker_param_file"
     }
   }
-  feature {
-    name: "compiler_input_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-c"
-        flag: "%{source_file}"
-      }
-      expand_if_all_available: "source_file"
-    }
-  }
-  feature {
-    name: "compiler_output_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-o"
-        flag: "%{output_object_file}"
-        expand_if_all_available: "output_object_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_assembly_file}"
-        flag: "-S"
-        expand_if_all_available: "output_assembly_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_preprocess_file}"
-        flag: "-E"
-        expand_if_all_available: "output_preprocess_file"
-      }
-    }
-  }
   action_config {
     config_name: "strip"
     action_name: "strip"
@@ -6259,8 +5997,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -6280,8 +6016,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -6301,8 +6035,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -6322,8 +6054,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -6343,8 +6073,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -6360,8 +6088,6 @@ toolchain {
         flag: "x86_64"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "objc_actions"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
@@ -6393,8 +6119,6 @@ toolchain {
         flag: "-std=gnu++11"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
     implies: "framework_paths"
@@ -6425,8 +6149,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -6446,8 +6168,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -7829,58 +7549,6 @@ toolchain {
       expand_if_all_available: "linker_param_file"
     }
   }
-  feature {
-    name: "compiler_input_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-c"
-        flag: "%{source_file}"
-      }
-      expand_if_all_available: "source_file"
-    }
-  }
-  feature {
-    name: "compiler_output_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-o"
-        flag: "%{output_object_file}"
-        expand_if_all_available: "output_object_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_assembly_file}"
-        flag: "-S"
-        expand_if_all_available: "output_assembly_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_preprocess_file}"
-        flag: "-E"
-        expand_if_all_available: "output_preprocess_file"
-      }
-    }
-  }
   action_config {
     config_name: "strip"
     action_name: "strip"
@@ -7935,8 +7603,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-compile"
@@ -7955,8 +7621,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -7975,8 +7639,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -7995,8 +7657,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -8015,8 +7675,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-compile"
@@ -8031,8 +7689,6 @@ toolchain {
         flag: "i386"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "objc_actions"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
@@ -8064,8 +7720,6 @@ toolchain {
         flag: "-std=gnu++11"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
     implies: "framework_paths"
@@ -8096,8 +7750,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -8116,8 +7768,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-archive"
@@ -9486,58 +9136,6 @@ toolchain {
       expand_if_all_available: "linker_param_file"
     }
   }
-  feature {
-    name: "compiler_input_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-c"
-        flag: "%{source_file}"
-      }
-      expand_if_all_available: "source_file"
-    }
-  }
-  feature {
-    name: "compiler_output_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-o"
-        flag: "%{output_object_file}"
-        expand_if_all_available: "output_object_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_assembly_file}"
-        flag: "-S"
-        expand_if_all_available: "output_assembly_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_preprocess_file}"
-        flag: "-E"
-        expand_if_all_available: "output_preprocess_file"
-      }
-    }
-  }
   action_config {
     config_name: "strip"
     action_name: "strip"
@@ -9592,8 +9190,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-compile"
@@ -9612,8 +9208,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -9632,8 +9226,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -9652,8 +9244,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -9672,8 +9262,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-compile"
@@ -9688,8 +9276,6 @@ toolchain {
         flag: "armv7"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "objc_actions"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
@@ -9720,8 +9306,6 @@ toolchain {
         flag: "-std=gnu++11"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
     implies: "framework_paths"
@@ -9751,8 +9335,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -9771,8 +9353,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-archive"
@@ -11143,58 +10723,6 @@ toolchain {
       expand_if_all_available: "linker_param_file"
     }
   }
-  feature {
-    name: "compiler_input_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-c"
-        flag: "%{source_file}"
-      }
-      expand_if_all_available: "source_file"
-    }
-  }
-  feature {
-    name: "compiler_output_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-o"
-        flag: "%{output_object_file}"
-        expand_if_all_available: "output_object_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_assembly_file}"
-        flag: "-S"
-        expand_if_all_available: "output_assembly_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_preprocess_file}"
-        flag: "-E"
-        expand_if_all_available: "output_preprocess_file"
-      }
-    }
-  }
   action_config {
     config_name: "strip"
     action_name: "strip"
@@ -11249,8 +10777,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-compile"
@@ -11269,8 +10795,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -11289,8 +10813,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -11309,8 +10831,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -11329,8 +10849,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-compile"
@@ -11345,8 +10863,6 @@ toolchain {
         flag: "armv7k"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "objc_actions"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
@@ -11377,8 +10893,6 @@ toolchain {
         flag: "-std=gnu++11"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
     implies: "framework_paths"
@@ -11408,8 +10922,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -11428,8 +10940,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-archive"
@@ -12822,58 +12332,6 @@ toolchain {
       expand_if_all_available: "linker_param_file"
     }
   }
-  feature {
-    name: "compiler_input_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-c"
-        flag: "%{source_file}"
-      }
-      expand_if_all_available: "source_file"
-    }
-  }
-  feature {
-    name: "compiler_output_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-o"
-        flag: "%{output_object_file}"
-        expand_if_all_available: "output_object_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_assembly_file}"
-        flag: "-S"
-        expand_if_all_available: "output_assembly_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_preprocess_file}"
-        flag: "-E"
-        expand_if_all_available: "output_preprocess_file"
-      }
-    }
-  }
   action_config {
     config_name: "strip"
     action_name: "strip"
@@ -12928,8 +12386,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -12949,8 +12405,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -12970,8 +12424,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -12991,8 +12443,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -13012,8 +12462,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -13029,8 +12477,6 @@ toolchain {
         flag: "arm64"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "objc_actions"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
@@ -13061,8 +12507,6 @@ toolchain {
         flag: "-std=gnu++11"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
     implies: "framework_paths"
@@ -13092,8 +12536,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -13113,8 +12555,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -14486,58 +13926,6 @@ toolchain {
       expand_if_all_available: "linker_param_file"
     }
   }
-  feature {
-    name: "compiler_input_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-c"
-        flag: "%{source_file}"
-      }
-      expand_if_all_available: "source_file"
-    }
-  }
-  feature {
-    name: "compiler_output_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-o"
-        flag: "%{output_object_file}"
-        expand_if_all_available: "output_object_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_assembly_file}"
-        flag: "-S"
-        expand_if_all_available: "output_assembly_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_preprocess_file}"
-        flag: "-E"
-        expand_if_all_available: "output_preprocess_file"
-      }
-    }
-  }
   action_config {
     config_name: "strip"
     action_name: "strip"
@@ -14592,8 +13980,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-compile"
@@ -14612,8 +13998,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -14632,8 +14016,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -14652,8 +14034,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -14672,8 +14052,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-compile"
@@ -14688,8 +14066,6 @@ toolchain {
         flag: "arm64"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "objc_actions"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
@@ -14720,8 +14096,6 @@ toolchain {
         flag: "-std=gnu++11"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
     implies: "framework_paths"
@@ -14751,8 +14125,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -14771,8 +14143,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-archive"
@@ -16147,58 +15517,6 @@ toolchain {
       expand_if_all_available: "linker_param_file"
     }
   }
-  feature {
-    name: "compiler_input_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-c"
-        flag: "%{source_file}"
-      }
-      expand_if_all_available: "source_file"
-    }
-  }
-  feature {
-    name: "compiler_output_flags"
-    flag_set {
-      action: "assemble"
-      action: "preprocess-assemble"
-      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"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-o"
-        flag: "%{output_object_file}"
-        expand_if_all_available: "output_object_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_assembly_file}"
-        flag: "-S"
-        expand_if_all_available: "output_assembly_file"
-      }
-      flag_group {
-        flag: "-o"
-        flag: "%{output_preprocess_file}"
-        flag: "-E"
-        expand_if_all_available: "output_preprocess_file"
-      }
-    }
-  }
   action_config {
     config_name: "strip"
     action_name: "strip"
@@ -16253,8 +15571,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-compile"
@@ -16273,8 +15589,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -16293,8 +15607,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -16313,8 +15625,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -16333,8 +15643,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-compile"
@@ -16349,8 +15657,6 @@ toolchain {
         flag: "<architecture>"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "objc_actions"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
@@ -16381,8 +15687,6 @@ toolchain {
         flag: "-std=gnu++11"
       }
     }
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
     implies: "apply_default_compiler_flags"
     implies: "apply_default_warnings"
     implies: "framework_paths"
@@ -16412,8 +15716,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -16432,8 +15734,6 @@ toolchain {
     implies: "user_compile_flags"
     implies: "sysroot"
     implies: "unfiltered_compile_flags"
-    implies: "compiler_input_flags"
-    implies: "compiler_output_flags"
   }
   action_config {
     config_name: "objc-archive"