Remove --experimental_enable_repo_mapping. It was experimental but ha…

…s also been a no-op for a release so it is safe to remove. RELNOTES: None PiperOrigin-RevId: 236166890
bazelbuild · Feb 28, 2019 · c32c334 · c32c334
1 parent c6c9b58
commit c32c334
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 20 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
@@ -102,18 +102,6 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl
       help = "If set to true, enables the APIs required to support the Android Starlark migration.")
   public boolean experimentalEnableAndroidMigrationApis;
 
-  @Option(
-      name = "experimental_enable_repo_mapping",
-      defaultValue = "false",
-      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-      effectTags = OptionEffectTag.NO_OP,
-      deprecationWarning =
-          "This behavior is on by default and the flag is a no-op. You can remove its usage",
-      help =
-          "This flag is a no-op. The use of the `repo_mapping` attribute in repository rules "
-              + "is enabled by default.")
-  public boolean experimentalEnableRepoMapping;
-
   // This flag is declared in StarlarkSemanticsOptions instead of JavaOptions because there is no
   // way to retrieve the java configuration from the Java implementation of
   // java_common.create_provider.
@@ -560,7 +548,6 @@ public StarlarkSemantics toSkylarkSemantics() {
         .experimentalBuildSettingApi(experimentalBuildSettingApi)
         .experimentalCcSkylarkApiEnabledPackages(experimentalCcSkylarkApiEnabledPackages)
         .experimentalEnableAndroidMigrationApis(experimentalEnableAndroidMigrationApis)
-        .experimentalEnableRepoMapping(experimentalEnableRepoMapping)
         .experimentalJavaCommonCreateProviderEnabledPackages(
             experimentalJavaCommonCreateProviderEnabledPackages)
         .experimentalPlatformsApi(experimentalPlatformsApi)

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
@@ -123,8 +123,6 @@ public boolean flagValue(FlagIdentifier flagIdentifier) {
 
   public abstract boolean experimentalEnableAndroidMigrationApis();
 
-  public abstract boolean experimentalEnableRepoMapping();
-
   public abstract ImmutableList<String> experimentalJavaCommonCreateProviderEnabledPackages();
 
   public abstract boolean experimentalPlatformsApi();
@@ -208,7 +206,6 @@ public static Builder builderWithDefaults() {
           .experimentalBuildSettingApi(false)
           .experimentalCcSkylarkApiEnabledPackages(ImmutableList.of())
           .experimentalEnableAndroidMigrationApis(false)
-          .experimentalEnableRepoMapping(false)
           .experimentalJavaCommonCreateProviderEnabledPackages(ImmutableList.of())
           .experimentalPlatformsApi(false)
           .experimentalStarlarkConfigTransitions(false)
@@ -256,8 +253,6 @@ public abstract static class Builder {
 
     public abstract Builder experimentalEnableAndroidMigrationApis(boolean value);
 
-    public abstract Builder experimentalEnableRepoMapping(boolean value);
-
     public abstract Builder experimentalJavaCommonCreateProviderEnabledPackages(List<String> value);
 
     public abstract Builder experimentalPlatformsApi(boolean value);

diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
@@ -125,7 +125,6 @@ private static StarlarkSemanticsOptions buildRandomOptions(Random rand) throws E
             + ","
             + rand.nextDouble(),
         "--experimental_enable_android_migration_apis=" + rand.nextBoolean(),
-        "--experimental_enable_repo_mapping=" + rand.nextBoolean(),
         "--experimental_java_common_create_provider_enabled_packages="
             + rand.nextDouble()
             + ","
@@ -175,7 +174,6 @@ private static StarlarkSemantics buildRandomSemantics(Random rand) {
         .experimentalCcSkylarkApiEnabledPackages(
             ImmutableList.of(String.valueOf(rand.nextDouble()), String.valueOf(rand.nextDouble())))
         .experimentalEnableAndroidMigrationApis(rand.nextBoolean())
-        .experimentalEnableRepoMapping(rand.nextBoolean())
         .experimentalJavaCommonCreateProviderEnabledPackages(
             ImmutableList.of(String.valueOf(rand.nextDouble()), String.valueOf(rand.nextDouble())))
         .experimentalPlatformsApi(rand.nextBoolean())