commit c2cd9574bd21c476043234b317b1730c5600bad0
author Googler <noreply@google.com> Tue Oct 02 14:38:15 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Tue Oct 02 14:40:20 2018 -0700
tree 01fe3511d2d764e9b1538b8797ce2018b3392db5
parent 20bfdc67dc1fc32ffebbda7088ba49ee17e3e182

Add a flag to guard the SkylarkCallables that have been exposed for the Android
Rules Starlark rewrite.

RELNOTES: None.
PiperOrigin-RevId: 215460549

src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
index 814394c..e253319 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
@@ -90,6 +90,14 @@
   public List<String> experimentalCcSkylarkApiEnabledPackages;
 
   @Option(
+      name = "experimental_enable_android_migration_apis",
+      defaultValue = "false",
+      documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+      effectTags = OptionEffectTag.BUILD_FILE_SEMANTICS,
+      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,
@@ -475,6 +483,7 @@
         // <== Add new options here in alphabetic order ==>
         .experimentalAnalysisTestingImprovements(experimentalAnalysisTestingImprovements)
         .experimentalCcSkylarkApiEnabledPackages(experimentalCcSkylarkApiEnabledPackages)
+        .experimentalEnableAndroidMigrationApis(experimentalEnableAndroidMigrationApis)
         .experimentalEnableRepoMapping(experimentalEnableRepoMapping)
         .experimentalRemapMainRepo(experimentalRemapMainRepo)
         .incompatibleBzlDisallowLoadAfterStatement(incompatibleBzlDisallowLoadAfterStatement)

src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
index 90192b7..9805d61 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
@@ -95,6 +95,8 @@
 
   public abstract List<String> experimentalCcSkylarkApiEnabledPackages();
 
+  public abstract boolean experimentalEnableAndroidMigrationApis();
+
   public abstract boolean experimentalEnableRepoMapping();
 
   public abstract boolean experimentalRemapMainRepo();
@@ -168,6 +170,7 @@
           // <== Add new options here in alphabetic order ==>
           .experimentalAnalysisTestingImprovements(false)
           .experimentalCcSkylarkApiEnabledPackages(ImmutableList.of())
+          .experimentalEnableAndroidMigrationApis(false)
           .experimentalEnableRepoMapping(false)
           .experimentalRemapMainRepo(false)
           .incompatibleBzlDisallowLoadAfterStatement(false)
@@ -207,6 +210,8 @@
 
     public abstract Builder experimentalCcSkylarkApiEnabledPackages(List<String> value);
 
+    public abstract Builder experimentalEnableAndroidMigrationApis(boolean value);
+
     public abstract Builder experimentalEnableRepoMapping(boolean value);
 
     public abstract Builder experimentalRemapMainRepo(boolean value);