diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBootstrap.java index b41e4c1bd592de..de0fbe0215c479 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBootstrap.java @@ -54,10 +54,13 @@ public AndroidBootstrap( @Override public void addBindingsToBuilder(ImmutableMap.Builder builder) { - builder.put( - "android_common", - FlagGuardedValue.onlyWhenExperimentalFlagIsTrue( - FlagIdentifier.EXPERIMENTAL_GOOGLE_LEGACY_API, androidCommon)); + // TODO: Make an incompatible change flag to hide android_common behind + // --experimental_google_legacy_api. + // Rationale: android_common module contains commonly used functions used outside of + // the Android Starlark migration. Let's not break them without an incompatible + // change process. + builder.put("android_common", androidCommon); + builder.put( ApkInfoApi.NAME, FlagGuardedValue.onlyWhenExperimentalFlagIsTrue(