Remove label-typed starlark build settings (in favor of label_flag and label_setting) RELNOTES: None. PiperOrigin-RevId: 247480051
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkConfig.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkConfig.java index e5b1f7c..59e27d2 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkConfig.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkConfig.java
@@ -14,8 +14,6 @@ package com.google.devtools.build.lib.analysis.skylark; -import static com.google.devtools.build.lib.packages.BuildType.LABEL; -import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST; import static com.google.devtools.build.lib.syntax.Type.BOOLEAN; import static com.google.devtools.build.lib.syntax.Type.INTEGER; import static com.google.devtools.build.lib.syntax.Type.STRING; @@ -50,16 +48,6 @@ } @Override - public BuildSetting labelSetting(Boolean flag) { - return new BuildSetting(flag, LABEL); - } - - @Override - public BuildSetting labelListSetting(Boolean flag) { - return new BuildSetting(flag, LABEL_LIST); - } - - @Override public void repr(SkylarkPrinter printer) { printer.append("<config>"); }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkConfigApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkConfigApi.java index 446183d..0975f427 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkConfigApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkConfigApi.java
@@ -110,34 +110,6 @@ }) BuildSettingApi stringListSetting(Boolean flag); - @SkylarkCallable( - name = "label", - doc = "A label typed build setting", - parameters = { - @Param( - name = FLAG_ARG, - type = Boolean.class, - defaultValue = "False", - doc = FLAG_ARG_DOC, - named = true, - positional = false) - }) - BuildSettingApi labelSetting(Boolean flag); - - @SkylarkCallable( - name = "label_list", - doc = "A label list-typed build setting", - parameters = { - @Param( - name = FLAG_ARG, - type = Boolean.class, - defaultValue = "False", - doc = FLAG_ARG_DOC, - named = true, - positional = false) - }) - BuildSettingApi labelListSetting(Boolean flag); - /** The API for build setting descriptors. */ @SkylarkModule( name = "BuildSetting",
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeConfigApi.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeConfigApi.java index 4fd7d0b..9ba35ce 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeConfigApi.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeConfigApi.java
@@ -41,15 +41,5 @@ } @Override - public BuildSettingApi labelSetting(Boolean flag) { - return new FakeBuildSettingDescriptor(); - } - - @Override - public BuildSettingApi labelListSetting(Boolean flag) { - return new FakeBuildSettingDescriptor(); - } - - @Override public void repr(SkylarkPrinter printer) {} }