Enable autoloads for rules_android

Downstream build: https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/4164 Downstream build shows that rules_android isn't quite yet ready, but I think it's better to enable the flag for Bazel 8 now, than to do an incompatible change later. PiperOrigin-RevId: 683271234 Change-Id: I4b1a8c5fe087f8dbf0742440d6af3c436bbf26d2
bazel-io · Oct 7, 2024 · 8d3bd0e · 8d3bd0e
1 parent 6e9de20
commit 8d3bd0e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AutoloadSymbols.java b/src/main/java/com/google/devtools/build/lib/packages/AutoloadSymbols.java
@@ -615,7 +615,10 @@ private static SymbolRedirect renamedSymbolRedirect(
 
   static {
     try {
-      requiredVersions = ImmutableMap.of("protobuf", Version.parse("29.0-rc1"));
+      requiredVersions =
+          ImmutableMap.of(
+              "protobuf", Version.parse("29.0-rc1"), //
+              "rules_android", Version.parse("0.6.0-rc1"));
     } catch (ParseException e) {
       throw new IllegalStateException(e);
     }

diff --git a/src/main/java/com/google/devtools/build/lib/packages/semantics/FlagConstants.java b/src/main/java/com/google/devtools/build/lib/packages/semantics/FlagConstants.java
@@ -24,7 +24,7 @@ private FlagConstants() {}
   public static final String DEFAULT_EXPERIMENTAL_RULE_EXTENSION_API = "true";
   public static final String DEFAULT_EXPERIMENTAL_RULE_EXTENSION_API_NAME = "+experimental_rule_extension_api";
 
-  public static final String DEFAULT_INCOMPATIBLE_AUTOLOAD_EXTERNALLY = "+@rules_python,+@rules_java,+@protobuf,@rules_shell";
+  public static final String DEFAULT_INCOMPATIBLE_AUTOLOAD_EXTERNALLY = "+@rules_python,+@rules_java,+@protobuf,@rules_shell,+@rules_android";
 
   public static final String DEFAULT_INCOMPATIBLE_PACKAGE_GROUP_HAS_PUBLIC_SYNTAX = "true";
   public static final String DEFAULT_INCOMPATIBLE_FIX_PACKAGE_GROUP_REPOROOT_SYNTAX = "true";