From b17552bfba80e69a4d86d5566c0237e6b8438fcf Mon Sep 17 00:00:00 2001 From: Googler Date: Tue, 27 Aug 2024 06:10:12 -0700 Subject: [PATCH] Stop guarding `android_common.create_dex_merger_actions` and `android_common.enable_implicit_sourceless_deps_exports_compatibility` behind `--experimental_enable_android_migration_apis`. See https://github.com/bazelbuild/rules_android/issues/219 PiperOrigin-RevId: 667957493 Change-Id: I013e29baa30d19ba1c5c0f1afee67b4bffd358f7 --- .../lib/starlarkbuildapi/android/AndroidStarlarkCommonApi.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/android/AndroidStarlarkCommonApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/android/AndroidStarlarkCommonApi.java index d4411722189c71..3c37592f70a505 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/android/AndroidStarlarkCommonApi.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/android/AndroidStarlarkCommonApi.java @@ -15,7 +15,6 @@ import com.google.devtools.build.lib.packages.Info; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; -import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions; import com.google.devtools.build.lib.starlarkbuildapi.FileApi; import com.google.devtools.build.lib.starlarkbuildapi.FilesToRunProviderApi; import com.google.devtools.build.lib.starlarkbuildapi.StarlarkRuleContextApi; @@ -71,7 +70,6 @@ public interface AndroidStarlarkCommonApi< name = "enable_implicit_sourceless_deps_exports_compatibility", doc = "Takes a JavaInfo and converts it to an implicit exportable JavaInfo.", documented = false, - enableOnlyWithFlag = BuildLanguageOptions.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS, parameters = { @Param( name = "dep", @@ -96,7 +94,6 @@ JavaInfoT enableImplicitSourcelessDepsExportsCompatibility(Info javaInfo, boolea + " from the input directory, merging all the dex archives inside the shard to a" + " single dexarchive under the output directory.", documented = false, - enableOnlyWithFlag = BuildLanguageOptions.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS, parameters = { @Param(name = "ctx", doc = "The rule context.", positional = true, named = false), @Param(