From 17ea8955fb29b594cd4d7a53251ad679b3659fb6 Mon Sep 17 00:00:00 2001
From: hlopko <hlopko@google.com>
Date: Thu, 21 Mar 2019 03:41:46 -0700
Subject: [PATCH] Flip --incompatible_disable_legacy_crosstool_fields and
 --incompatible_disable_expand_if_all_available_in_flag_set

Fixes #7008
Fixes #6861

This is an encore of https://github.com/bazelbuild/bazel/commit/c18be0b0a0bf626edb98ac684fc579059af38b8c.

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` has been flipped (https://github.com/bazelbuild/bazel/issues/7008)
PiperOrigin-RevId: 239567807
---
 .../com/google/devtools/build/lib/rules/cpp/CppOptions.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
index 8aee22645281dd..21a49ee626645b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
+++ b/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 = "false",
+      defaultValue = "true",
       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 = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
       effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
       metadataTags = {