Get rid of legacy default features that are not needed any more.

--
MOS_MIGRATED_REVID=97675547

1 files changed, 0 insertions, 115 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index dfbf191f82..06c9e6b9cc 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -691,121 +691,6 @@ public class CppConfiguration extends BuildConfiguration.Fragment {
       return toolchain;
     }
     try {
-      if (!features.contains("use_header_modules")) {
-        TextFormat.merge(""
-            + "feature {"
-            + "  name: 'use_header_modules'"
-            + "  implies: 'use_module_maps'"
-            + "  requires { feature: 'layering_check' }"
-            + "  requires { feature: 'header_modules' }"
-            + "  flag_set {"
-            + "    action: 'c-compile'"
-            + "    action: 'c++-compile'"
-            + "    action: 'c++-header-parsing'"
-            + "    action: 'c++-header-preprocessing'"
-            + "    action: 'c++-module-compile'"
-            + "    flag_group {"
-            + "      flag: '-Xclang-only=-fmodules'"
-            + "      flag: '-Xclang-only=-fmodules-decluse'"
-            + "    }"
-            + "    flag_group {"
-            + "      flag: '-Xclang=-fmodule-file=%{module_files}'"
-            + "    }"
-            + "  }"
-            + "}",
-            toolchainBuilder);
-      }
-      if (!features.contains("module_maps")) {
-        TextFormat.merge(""
-            + "feature { name: 'module_maps' }",
-            toolchainBuilder);
-      }
-      if (!features.contains("use_module_maps")) {
-        TextFormat.merge(""
-            + "feature {"
-            + "  name: 'use_module_maps'"
-            + "  requires: { feature: 'module_maps' }"
-            + "  flag_set {"
-            + "    action: 'c-compile'"
-            + "    action: 'c++-compile'"
-            + "    action: 'c++-header-parsing'"
-            + "    action: 'c++-header-preprocessing'"
-            + "    action: 'c++-module-compile'"
-            + "    flag_group {"
-            + "      flag: '-Xclang-only=-fmodule-maps'"
-            + "      flag: '-Xclang-only=-fmodule-name=%{module_name}'"
-            + "      flag: '-Xclang-only=-fmodule-map-file=%{module_map_file}'"
-            + "      flag: '-Xclang=-fno-modules-implicit-maps'"
-            + "    }"
-            + "  }"
-            + "}",
-            toolchainBuilder);
-      }
-      if (!features.contains("header_modules")) {
-        TextFormat.merge(""
-            + "feature {"
-            + "  name: 'header_modules'"
-            + "  implies: 'use_header_modules'"
-            + "  flag_set {"
-            + "    action: 'c++-module-compile'"
-            + "    flag_group {"
-            + "      flag: '-x'"
-            + "      flag: 'c++'"
-            + "      flag: '-Xclang=-emit-module'"
-            + "      flag: '-Xcrosstool-module-compilation'"
-            + "    }"
-            + "  }"
-            + "}",
-            toolchainBuilder);
-      }
-      if (!features.contains("layering_check")) {
-        TextFormat.merge(""
-            + "feature {"
-            + "  name: 'layering_check'"
-            + "  implies: 'use_module_maps'"
-            + "  flag_set {"
-            + "    action: 'c-compile'"
-            + "    action: 'c++-compile'"
-            + "    action: 'c++-header-parsing'"
-            + "    action: 'c++-header-preprocessing'"
-            + "    action: 'c++-module-compile'"
-            + "    flag_group {"
-            + "      flag: '-Xclang-only=-fmodules-strict-decluse'"
-            + "    }"
-            + "  }"
-            + "}",
-            toolchainBuilder);
-      }
-      if (!features.contains("parse_headers")) {
-        TextFormat.merge(""
-            + "feature {"
-            + "  name: 'parse_headers'"
-            + "  flag_set {"
-            + "    action: 'c++-header-parsing'"
-            + "    flag_group {"
-            + "      flag: '-x'"
-            + "      flag: 'c++-header'"
-            + "      flag: '-fsyntax-only'"
-            + "    }"
-            + "  }"
-            + "}",
-            toolchainBuilder);
-      }
-      if (!features.contains("preprocess_headers")) {
-        TextFormat.merge(""
-            + "feature {"
-            + "  name: 'preprocess_headers'"
-            + "  flag_set {"
-            + "    action: 'c++-header-preprocessing'"
-            + "    flag_group {"
-            + "      flag: '-x'"
-            + "      flag: 'c++'"
-            + "      flag: '-E'"
-            + "    }"
-            + "  }"
-            + "}",
-            toolchainBuilder);
-      }
       if (!features.contains("include_paths")) {
         TextFormat.merge(""
             + "feature {"