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 index aff41ff1ffb41b..8968c032c1b3fc 100644 --- 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 index a49686fb81f069..44feafb8f50f14 100644 --- 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";