Internal change

PiperOrigin-RevId: 167751263

1 files changed, 156 insertions, 888 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 f01c9e1fce..86e7e7c344 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
@@ -208,27 +208,6 @@ toolchain {
     name: "is_not_test_target"
   }
   feature {
-    name: "legacy_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{legacy_compile_flags}"
-        iterate_over: "legacy_compile_flags"
-      }
-      expand_if_all_available: "legacy_compile_flags"
-    }
-  }
-  feature {
     name: "generate_dsym_file"
     flag_set {
       action: "c-compile"
@@ -1179,7 +1158,7 @@ toolchain {
     name: "bitcode_embedded"
   }
   feature {
-    name: "user_compile_flags"
+    name: "copts"
     flag_set {
       action: "assemble"
       action: "preprocess-assemble"
@@ -1189,35 +1168,13 @@ toolchain {
       action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
-      action: "lto-backend"
       action: "objc-compile"
       action: "objc++-compile"
       flag_group {
-        flag: "%{user_compile_flags}"
-        iterate_over: "user_compile_flags"
+        flag: "%{copts}"
+        iterate_over: "copts"
       }
-      expand_if_all_available: "user_compile_flags"
-    }
-  }
-  feature {
-    name: "unfiltered_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{unfiltered_compile_flags}"
-        iterate_over: "unfiltered_compile_flags"
-      }
-      expand_if_all_available: "unfiltered_compile_flags"
+      expand_if_all_available: "copts"
     }
   }
   feature {
@@ -1302,9 +1259,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-compile"
@@ -1324,9 +1279,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -1341,9 +1294,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -1358,9 +1309,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -1375,9 +1324,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-compile"
@@ -1401,9 +1348,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc++-compile"
@@ -1428,9 +1373,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "assemble"
@@ -1443,9 +1386,7 @@ toolchain {
     implies: "no_objc_arc"
     implies: "include_system_dirs"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -1460,9 +1401,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-archive"
@@ -1902,27 +1841,6 @@ toolchain {
     name: "is_not_test_target"
   }
   feature {
-    name: "legacy_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{legacy_compile_flags}"
-        iterate_over: "legacy_compile_flags"
-      }
-      expand_if_all_available: "legacy_compile_flags"
-    }
-  }
-  feature {
     name: "generate_dsym_file"
     flag_set {
       action: "c-compile"
@@ -2873,7 +2791,7 @@ toolchain {
     name: "bitcode_embedded"
   }
   feature {
-    name: "user_compile_flags"
+    name: "copts"
     flag_set {
       action: "assemble"
       action: "preprocess-assemble"
@@ -2883,35 +2801,13 @@ toolchain {
       action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
-      action: "lto-backend"
       action: "objc-compile"
       action: "objc++-compile"
       flag_group {
-        flag: "%{user_compile_flags}"
-        iterate_over: "user_compile_flags"
+        flag: "%{copts}"
+        iterate_over: "copts"
       }
-      expand_if_all_available: "user_compile_flags"
-    }
-  }
-  feature {
-    name: "unfiltered_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{unfiltered_compile_flags}"
-        iterate_over: "unfiltered_compile_flags"
-      }
-      expand_if_all_available: "unfiltered_compile_flags"
+      expand_if_all_available: "copts"
     }
   }
   feature {
@@ -2996,9 +2892,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-compile"
@@ -3018,9 +2912,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -3035,9 +2927,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -3052,9 +2942,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -3069,9 +2957,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-compile"
@@ -3095,9 +2981,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc++-compile"
@@ -3122,9 +3006,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "assemble"
@@ -3137,9 +3019,7 @@ toolchain {
     implies: "no_objc_arc"
     implies: "include_system_dirs"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -3154,9 +3034,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-archive"
@@ -3596,27 +3474,6 @@ toolchain {
     name: "is_not_test_target"
   }
   feature {
-    name: "legacy_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{legacy_compile_flags}"
-        iterate_over: "legacy_compile_flags"
-      }
-      expand_if_all_available: "legacy_compile_flags"
-    }
-  }
-  feature {
     name: "generate_dsym_file"
     flag_set {
       action: "c-compile"
@@ -4567,28 +4424,7 @@ toolchain {
     name: "bitcode_embedded"
   }
   feature {
-    name: "user_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{user_compile_flags}"
-        iterate_over: "user_compile_flags"
-      }
-      expand_if_all_available: "user_compile_flags"
-    }
-  }
-  feature {
-    name: "unfiltered_compile_flags"
+    name: "copts"
     flag_set {
       action: "assemble"
       action: "preprocess-assemble"
@@ -4598,14 +4434,13 @@ toolchain {
       action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
-      action: "lto-backend"
       action: "objc-compile"
       action: "objc++-compile"
       flag_group {
-        flag: "%{unfiltered_compile_flags}"
-        iterate_over: "unfiltered_compile_flags"
+        flag: "%{copts}"
+        iterate_over: "copts"
       }
-      expand_if_all_available: "unfiltered_compile_flags"
+      expand_if_all_available: "copts"
     }
   }
   feature {
@@ -4690,9 +4525,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-compile"
@@ -4712,9 +4545,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -4729,9 +4560,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -4746,9 +4575,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -4763,9 +4590,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-compile"
@@ -4789,9 +4614,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc++-compile"
@@ -4816,9 +4639,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "assemble"
@@ -4831,9 +4652,7 @@ toolchain {
     implies: "no_objc_arc"
     implies: "include_system_dirs"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -4848,9 +4667,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-archive"
@@ -5290,27 +5107,6 @@ toolchain {
     name: "is_not_test_target"
   }
   feature {
-    name: "legacy_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{legacy_compile_flags}"
-        iterate_over: "legacy_compile_flags"
-      }
-      expand_if_all_available: "legacy_compile_flags"
-    }
-  }
-  feature {
     name: "generate_dsym_file"
     flag_set {
       action: "c-compile"
@@ -6261,7 +6057,7 @@ toolchain {
     name: "bitcode_embedded"
   }
   feature {
-    name: "user_compile_flags"
+    name: "copts"
     flag_set {
       action: "assemble"
       action: "preprocess-assemble"
@@ -6271,35 +6067,13 @@ toolchain {
       action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
-      action: "lto-backend"
       action: "objc-compile"
       action: "objc++-compile"
       flag_group {
-        flag: "%{user_compile_flags}"
-        iterate_over: "user_compile_flags"
+        flag: "%{copts}"
+        iterate_over: "copts"
       }
-      expand_if_all_available: "user_compile_flags"
-    }
-  }
-  feature {
-    name: "unfiltered_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{unfiltered_compile_flags}"
-        iterate_over: "unfiltered_compile_flags"
-      }
-      expand_if_all_available: "unfiltered_compile_flags"
+      expand_if_all_available: "copts"
     }
   }
   feature {
@@ -6384,9 +6158,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-compile"
@@ -6406,9 +6178,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -6423,9 +6193,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -6440,9 +6208,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -6457,9 +6223,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-compile"
@@ -6483,9 +6247,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc++-compile"
@@ -6510,9 +6272,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "assemble"
@@ -6525,9 +6285,7 @@ toolchain {
     implies: "no_objc_arc"
     implies: "include_system_dirs"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -6542,9 +6300,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-archive"
@@ -6988,27 +6744,6 @@ toolchain {
     name: "is_not_test_target"
   }
   feature {
-    name: "legacy_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{legacy_compile_flags}"
-        iterate_over: "legacy_compile_flags"
-      }
-      expand_if_all_available: "legacy_compile_flags"
-    }
-  }
-  feature {
     name: "generate_dsym_file"
     flag_set {
       action: "c-compile"
@@ -7963,7 +7698,7 @@ toolchain {
     name: "bitcode_embedded"
   }
   feature {
-    name: "user_compile_flags"
+    name: "copts"
     flag_set {
       action: "assemble"
       action: "preprocess-assemble"
@@ -7973,35 +7708,13 @@ toolchain {
       action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
-      action: "lto-backend"
       action: "objc-compile"
       action: "objc++-compile"
       flag_group {
-        flag: "%{user_compile_flags}"
-        iterate_over: "user_compile_flags"
+        flag: "%{copts}"
+        iterate_over: "copts"
       }
-      expand_if_all_available: "user_compile_flags"
-    }
-  }
-  feature {
-    name: "unfiltered_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{unfiltered_compile_flags}"
-        iterate_over: "unfiltered_compile_flags"
-      }
-      expand_if_all_available: "unfiltered_compile_flags"
+      expand_if_all_available: "copts"
     }
   }
   feature {
@@ -8086,9 +7799,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-compile"
@@ -8108,9 +7819,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -8125,9 +7834,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -8142,9 +7849,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -8159,9 +7864,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-compile"
@@ -8185,9 +7888,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "apply_simulator_compiler_flags"
   }
   action_config {
@@ -8213,9 +7914,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "apply_simulator_compiler_flags"
   }
   action_config {
@@ -8229,9 +7928,7 @@ toolchain {
     implies: "no_objc_arc"
     implies: "include_system_dirs"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -8246,9 +7943,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-archive"
@@ -8692,27 +8387,6 @@ toolchain {
     name: "is_not_test_target"
   }
   feature {
-    name: "legacy_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{legacy_compile_flags}"
-        iterate_over: "legacy_compile_flags"
-      }
-      expand_if_all_available: "legacy_compile_flags"
-    }
-  }
-  feature {
     name: "generate_dsym_file"
     flag_set {
       action: "c-compile"
@@ -9669,28 +9343,7 @@ toolchain {
     name: "bitcode_embedded"
   }
   feature {
-    name: "user_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{user_compile_flags}"
-        iterate_over: "user_compile_flags"
-      }
-      expand_if_all_available: "user_compile_flags"
-    }
-  }
-  feature {
-    name: "unfiltered_compile_flags"
+    name: "copts"
     flag_set {
       action: "assemble"
       action: "preprocess-assemble"
@@ -9700,14 +9353,13 @@ toolchain {
       action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
-      action: "lto-backend"
       action: "objc-compile"
       action: "objc++-compile"
       flag_group {
-        flag: "%{unfiltered_compile_flags}"
-        iterate_over: "unfiltered_compile_flags"
+        flag: "%{copts}"
+        iterate_over: "copts"
       }
-      expand_if_all_available: "unfiltered_compile_flags"
+      expand_if_all_available: "copts"
     }
   }
   feature {
@@ -9792,9 +9444,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-compile"
@@ -9814,9 +9464,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -9831,9 +9479,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -9848,9 +9494,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -9865,9 +9509,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-compile"
@@ -9891,9 +9533,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "apply_simulator_compiler_flags"
   }
   action_config {
@@ -9919,9 +9559,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "apply_simulator_compiler_flags"
   }
   action_config {
@@ -9935,9 +9573,7 @@ toolchain {
     implies: "no_objc_arc"
     implies: "include_system_dirs"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -9952,9 +9588,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-archive"
@@ -10399,27 +10033,6 @@ toolchain {
     name: "is_not_test_target"
   }
   feature {
-    name: "legacy_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{legacy_compile_flags}"
-        iterate_over: "legacy_compile_flags"
-      }
-      expand_if_all_available: "legacy_compile_flags"
-    }
-  }
-  feature {
     name: "generate_dsym_file"
     flag_set {
       action: "c-compile"
@@ -11400,7 +11013,7 @@ toolchain {
     name: "bitcode_embedded"
   }
   feature {
-    name: "user_compile_flags"
+    name: "copts"
     flag_set {
       action: "assemble"
       action: "preprocess-assemble"
@@ -11410,35 +11023,13 @@ toolchain {
       action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
-      action: "lto-backend"
       action: "objc-compile"
       action: "objc++-compile"
       flag_group {
-        flag: "%{user_compile_flags}"
-        iterate_over: "user_compile_flags"
+        flag: "%{copts}"
+        iterate_over: "copts"
       }
-      expand_if_all_available: "user_compile_flags"
-    }
-  }
-  feature {
-    name: "unfiltered_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{unfiltered_compile_flags}"
-        iterate_over: "unfiltered_compile_flags"
-      }
-      expand_if_all_available: "unfiltered_compile_flags"
+      expand_if_all_available: "copts"
     }
   }
   feature {
@@ -11523,9 +11114,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -11546,9 +11135,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -11564,9 +11151,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -11582,9 +11167,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -11600,9 +11183,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -11627,9 +11208,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "apply_simulator_compiler_flags"
   }
   action_config {
@@ -11655,9 +11234,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "apply_simulator_compiler_flags"
   }
   action_config {
@@ -11671,9 +11248,7 @@ toolchain {
     implies: "no_objc_arc"
     implies: "include_system_dirs"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -11689,9 +11264,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -12136,27 +11709,6 @@ toolchain {
     name: "is_not_test_target"
   }
   feature {
-    name: "legacy_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{legacy_compile_flags}"
-        iterate_over: "legacy_compile_flags"
-      }
-      expand_if_all_available: "legacy_compile_flags"
-    }
-  }
-  feature {
     name: "generate_dsym_file"
     flag_set {
       action: "c-compile"
@@ -13111,7 +12663,7 @@ toolchain {
     name: "bitcode_embedded"
   }
   feature {
-    name: "user_compile_flags"
+    name: "copts"
     flag_set {
       action: "assemble"
       action: "preprocess-assemble"
@@ -13121,35 +12673,13 @@ toolchain {
       action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
-      action: "lto-backend"
       action: "objc-compile"
       action: "objc++-compile"
       flag_group {
-        flag: "%{user_compile_flags}"
-        iterate_over: "user_compile_flags"
+        flag: "%{copts}"
+        iterate_over: "copts"
       }
-      expand_if_all_available: "user_compile_flags"
-    }
-  }
-  feature {
-    name: "unfiltered_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{unfiltered_compile_flags}"
-        iterate_over: "unfiltered_compile_flags"
-      }
-      expand_if_all_available: "unfiltered_compile_flags"
+      expand_if_all_available: "copts"
     }
   }
   feature {
@@ -13234,9 +12764,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-compile"
@@ -13256,9 +12784,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -13273,9 +12799,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -13290,9 +12814,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -13307,9 +12829,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-compile"
@@ -13333,9 +12853,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "apply_simulator_compiler_flags"
   }
   action_config {
@@ -13361,9 +12879,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "apply_simulator_compiler_flags"
   }
   action_config {
@@ -13377,9 +12893,7 @@ toolchain {
     implies: "no_objc_arc"
     implies: "include_system_dirs"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -13394,9 +12908,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-archive"
@@ -13840,27 +13352,6 @@ toolchain {
     name: "is_not_test_target"
   }
   feature {
-    name: "legacy_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{legacy_compile_flags}"
-        iterate_over: "legacy_compile_flags"
-      }
-      expand_if_all_available: "legacy_compile_flags"
-    }
-  }
-  feature {
     name: "generate_dsym_file"
     flag_set {
       action: "c-compile"
@@ -14837,28 +14328,7 @@ toolchain {
     }
   }
   feature {
-    name: "user_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{user_compile_flags}"
-        iterate_over: "user_compile_flags"
-      }
-      expand_if_all_available: "user_compile_flags"
-    }
-  }
-  feature {
-    name: "unfiltered_compile_flags"
+    name: "copts"
     flag_set {
       action: "assemble"
       action: "preprocess-assemble"
@@ -14868,14 +14338,13 @@ toolchain {
       action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
-      action: "lto-backend"
       action: "objc-compile"
       action: "objc++-compile"
       flag_group {
-        flag: "%{unfiltered_compile_flags}"
-        iterate_over: "unfiltered_compile_flags"
+        flag: "%{copts}"
+        iterate_over: "copts"
       }
-      expand_if_all_available: "unfiltered_compile_flags"
+      expand_if_all_available: "copts"
     }
   }
   feature {
@@ -14960,9 +14429,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-compile"
@@ -14982,9 +14449,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -14999,9 +14464,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -15016,9 +14479,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -15033,9 +14494,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-compile"
@@ -15059,9 +14518,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc++-compile"
@@ -15086,9 +14543,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "assemble"
@@ -15101,9 +14556,7 @@ toolchain {
     implies: "no_objc_arc"
     implies: "include_system_dirs"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -15118,9 +14571,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-archive"
@@ -15564,27 +15015,6 @@ toolchain {
     name: "is_not_test_target"
   }
   feature {
-    name: "legacy_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{legacy_compile_flags}"
-        iterate_over: "legacy_compile_flags"
-      }
-      expand_if_all_available: "legacy_compile_flags"
-    }
-  }
-  feature {
     name: "generate_dsym_file"
     flag_set {
       action: "c-compile"
@@ -16563,7 +15993,7 @@ toolchain {
     }
   }
   feature {
-    name: "user_compile_flags"
+    name: "copts"
     flag_set {
       action: "assemble"
       action: "preprocess-assemble"
@@ -16573,35 +16003,13 @@ toolchain {
       action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
-      action: "lto-backend"
       action: "objc-compile"
       action: "objc++-compile"
       flag_group {
-        flag: "%{user_compile_flags}"
-        iterate_over: "user_compile_flags"
+        flag: "%{copts}"
+        iterate_over: "copts"
       }
-      expand_if_all_available: "user_compile_flags"
-    }
-  }
-  feature {
-    name: "unfiltered_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{unfiltered_compile_flags}"
-        iterate_over: "unfiltered_compile_flags"
-      }
-      expand_if_all_available: "unfiltered_compile_flags"
+      expand_if_all_available: "copts"
     }
   }
   feature {
@@ -16686,9 +16094,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-compile"
@@ -16708,9 +16114,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -16725,9 +16129,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -16742,9 +16144,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -16759,9 +16159,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-compile"
@@ -16785,9 +16183,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc++-compile"
@@ -16812,9 +16208,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "assemble"
@@ -16827,9 +16221,7 @@ toolchain {
     implies: "no_objc_arc"
     implies: "include_system_dirs"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -16844,9 +16236,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-archive"
@@ -17291,27 +16681,6 @@ toolchain {
     name: "is_not_test_target"
   }
   feature {
-    name: "legacy_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{legacy_compile_flags}"
-        iterate_over: "legacy_compile_flags"
-      }
-      expand_if_all_available: "legacy_compile_flags"
-    }
-  }
-  feature {
     name: "generate_dsym_file"
     flag_set {
       action: "c-compile"
@@ -18314,7 +17683,7 @@ toolchain {
     }
   }
   feature {
-    name: "user_compile_flags"
+    name: "copts"
     flag_set {
       action: "assemble"
       action: "preprocess-assemble"
@@ -18324,35 +17693,13 @@ toolchain {
       action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
-      action: "lto-backend"
       action: "objc-compile"
       action: "objc++-compile"
       flag_group {
-        flag: "%{user_compile_flags}"
-        iterate_over: "user_compile_flags"
+        flag: "%{copts}"
+        iterate_over: "copts"
       }
-      expand_if_all_available: "user_compile_flags"
-    }
-  }
-  feature {
-    name: "unfiltered_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{unfiltered_compile_flags}"
-        iterate_over: "unfiltered_compile_flags"
-      }
-      expand_if_all_available: "unfiltered_compile_flags"
+      expand_if_all_available: "copts"
     }
   }
   feature {
@@ -18437,9 +17784,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -18460,9 +17805,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -18478,9 +17821,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -18496,9 +17837,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -18514,9 +17853,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -18541,9 +17878,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc++-compile"
@@ -18568,9 +17903,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "assemble"
@@ -18583,9 +17916,7 @@ toolchain {
     implies: "no_objc_arc"
     implies: "include_system_dirs"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -18601,9 +17932,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
     implies: "unfiltered_cxx_flags"
   }
   action_config {
@@ -19048,27 +18377,6 @@ toolchain {
     name: "is_not_test_target"
   }
   feature {
-    name: "legacy_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{legacy_compile_flags}"
-        iterate_over: "legacy_compile_flags"
-      }
-      expand_if_all_available: "legacy_compile_flags"
-    }
-  }
-  feature {
     name: "generate_dsym_file"
     flag_set {
       action: "c-compile"
@@ -20045,28 +19353,7 @@ toolchain {
     }
   }
   feature {
-    name: "user_compile_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: "lto-backend"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "%{user_compile_flags}"
-        iterate_over: "user_compile_flags"
-      }
-      expand_if_all_available: "user_compile_flags"
-    }
-  }
-  feature {
-    name: "unfiltered_compile_flags"
+    name: "copts"
     flag_set {
       action: "assemble"
       action: "preprocess-assemble"
@@ -20076,14 +19363,13 @@ toolchain {
       action: "c++-header-preprocessing"
       action: "c++-module-compile"
       action: "c++-module-codegen"
-      action: "lto-backend"
       action: "objc-compile"
       action: "objc++-compile"
       flag_group {
-        flag: "%{unfiltered_compile_flags}"
-        iterate_over: "unfiltered_compile_flags"
+        flag: "%{copts}"
+        iterate_over: "copts"
       }
-      expand_if_all_available: "unfiltered_compile_flags"
+      expand_if_all_available: "copts"
     }
   }
   feature {
@@ -20168,9 +19454,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-compile"
@@ -20190,9 +19474,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-module-compile"
@@ -20207,9 +19489,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-parsing"
@@ -20224,9 +19504,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "c++-header-preprocessing"
@@ -20241,9 +19519,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-compile"
@@ -20267,9 +19543,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc++-compile"
@@ -20294,9 +19568,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "assemble"
@@ -20309,9 +19581,7 @@ toolchain {
     implies: "no_objc_arc"
     implies: "include_system_dirs"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "preprocess-assemble"
@@ -20326,9 +19596,7 @@ toolchain {
     implies: "objc_arc"
     implies: "no_objc_arc"
     implies: "apple_env"
-    implies: "legacy_compile_flags"
-    implies: "user_compile_flags"
-    implies: "unfiltered_compile_flags"
+    implies: "copts"
   }
   action_config {
     config_name: "objc-archive"