From 1311bed1b6441ed1001e2a5da5aa203ce5cbef2c Mon Sep 17 00:00:00 2001
From: Luca Di Grazia <luca.digrazia94@gmail.com>
Date: Sun, 4 Sep 2022 20:18:06 +0200
Subject: [PATCH]     Automated rollback of commit
 c18be0b0a0bf626edb98ac684fc579059af38b8c.

    *** Reason for rollback ***

    https://buildkite.com/bazel/bazel-bazel/builds/7163

    *** Original change description ***

    Flip --incompatible_disable_legacy_crosstool_fields and --incompatible_disable_expand_if_all_available_in_flag_set

    Fixes #7008
    Fixes #6861

    TESTED=https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/852#5c90f69e-c5d2-44c1-8067-0bde4cba6f6d (remote execution is fixed after syncing, verified locally)

    RELNOTES: `--incompatible_disable_legacy_crosstool_fields` has been flipped (https://github.com/bazelbuild/bazel/issues/6861)
    `--incompatible_disable_expand_if_all_available_in_flag_set...

    ***

    RELNOTES: None.
    PiperOrigin-RevId: 238193947
---
 .../com/google/devtools/build/lib/rules/cpp/CppOptions.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
index 21a49ee6266..8aee2264528 100644
--- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
+++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
@@ -710,7 +710,7 @@ public Label getFdoPrefetchHintsLabel() {
   @Option(
       name = "incompatible_disable_legacy_crosstool_fields",
       oldName = "experimental_disable_legacy_crosstool_fields",
-      defaultValue = "true",
+      defaultValue = "false",
       documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
       effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
       metadataTags = {
@@ -753,7 +753,7 @@ public Label getFdoPrefetchHintsLabel() {
 
   @Option(
       name = "incompatible_disable_expand_if_all_available_in_flag_set",
-      defaultValue = "true",
+      defaultValue = "false",
       documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
       effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
       metadataTags = {