From 536a166270590a8dbc701718550383f3a07cc763 Mon Sep 17 00:00:00 2001
From: juliexxia <juliexxia@google.com>
Date: Thu, 30 May 2019 16:39:14 -0700
Subject: [PATCH] Turn on --experimental_build_setting_api

RELNOTES: Turn on --experimental_build_setting_api by default for starlark build settings (see https://docs.bazel.build/versions/master/skylark/config.html#user-defined-build-settings for more info)

SKIP_CI=blaze is borked
PiperOrigin-RevId: 250788338
---
 .../lib/packages/StarlarkSemanticsOptions.java      |  2 +-
 .../build/lib/syntax/StarlarkSemantics.java         |  2 +-
 .../integration/starlark_configurations_test.sh     | 13 -------------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
index cce394667af811..ab878fc6964881 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -77,7 +77,7 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl
 
   @Option(
       name = "experimental_build_setting_api",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = OptionEffectTag.BUILD_FILE_SEMANTICS,
       help =
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
index 8412a5114d9c18..b8763973e3ab0f 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -218,7 +218,7 @@ public static Builder builderWithDefaults() {
   public static final StarlarkSemantics DEFAULT_SEMANTICS =
       builder()
           // <== Add new options here in alphabetic order ==>
-          .experimentalBuildSettingApi(false)
+          .experimentalBuildSettingApi(true)
           .experimentalCcSkylarkApiEnabledPackages(ImmutableList.of())
           .experimentalAllowIncrementalRepositoryUpdates(false)
           .experimentalEnableAndroidMigrationApis(false)
diff --git a/src/test/shell/integration/starlark_configurations_test.sh b/src/test/shell/integration/starlark_configurations_test.sh
index e0b2e59e1edfec..859d514c3f3ff3 100755
--- a/src/test/shell/integration/starlark_configurations_test.sh
+++ b/src/test/shell/integration/starlark_configurations_test.sh
@@ -161,19 +161,6 @@ function test_dont_parse_flags_after_dash_dash() {
   expect_log "invalid package name '-//test_dont_parse_flags_after_dash_dash'"
 }
 
-function test_doesnt_work_without_experimental_flag() {
-  local -r pkg=$FUNCNAME
-  mkdir -p $pkg
-
-  write_build_setting_bzl
-
-  bazel build //$pkg:my_drink --//$pkg:type=coffee > output 2>"$TEST_log" \
-    && fail "Expected failure"
-
-  expect_log "Error loading option //$pkg:type:"
-  expect_log "Extension file '$pkg/build_setting.bzl' has errors"
-}
-
 function test_multiple_starlark_flags() {
   local -r pkg=$FUNCNAME
   mkdir -p $pkg