Skip to content

[9.0.0] Make --incompatible_enable_proto_toolchain_resolution default to true in Bazel #28182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iancha1992 merged 1 commit into from
Jan 8, 2026
+7 −2
Merged

[9.0.0] Make --incompatible_enable_proto_toolchain_resolution default to true in Bazel #28182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ public final class BuildLanguageOptions extends OptionsBase {
// Flip when dependencies to rules_* repos are upgraded and protobuf registers toolchains
@Option(
name = "incompatible_enable_proto_toolchain_resolution",
defaultValue = "false",
defaultValue = FlagConstants.DEFAULT_INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION,
documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
Expand Down Expand Up @@ -1109,7 +1109,7 @@ public FlagConsumer setBool(String key, boolean ignored) {
public static final String INCOMPATIBLE_FAIL_ON_UNKNOWN_ATTRIBUTES =
"+incompatible_fail_on_unknown_attributes";
public static final String INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION =
"-incompatible_enable_proto_toolchain_resolution";
FlagConstants.DEFAULT_INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION_NAME;
public static final String INCOMPATIBLE_DISABLE_NON_EXECUTABLE_JAVA_BINARY =
"-incompatible_disable_non_executable_java_binary";
public static final String INCOMPATIBLE_DISABLE_TARGET_DEFAULT_PROVIDER_FIELDS =
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/google/devtools/build/lib/packages/semantics/FlagConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,8 @@ private FlagConstants() {}
"+incompatible_package_group_has_public_syntax";
public static final String INCOMPATIBLE_FIX_PACKAGE_GROUP_REPOROOT_SYNTAX =
"+incompatible_fix_package_group_reporoot_syntax";

public static final String DEFAULT_INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION = "true";
public static final String DEFAULT_INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION_NAME =
"+incompatible_enable_proto_toolchain_resolution";
}
1 change: 1 addition & 0 deletions ...java/com/google/devtools/build/lib/rules/java/proto/StarlarkJavaLiteProtoLibraryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public class StarlarkJavaLiteProtoLibraryTest extends BuildViewTestCase {

@Before
public final void setUpMocks() throws Exception {
setBuildLanguageOptions("--incompatible_enable_proto_toolchain_resolution=false");
useConfiguration(
"--proto_compiler=//proto:compiler",
"--proto_toolchain_for_javalite=//tools/proto/toolchains:javalite");
Expand Down
Loading