From 99d3d9612e508a5b503db11ad696b82edb35460c Mon Sep 17 00:00:00 2001 From: Googler Date: Thu, 24 Feb 2022 09:53:42 -0800 Subject: [PATCH 1/4] Make protocOpts() public. RELNOTES: Make protocOpts() publicly accessible. PiperOrigin-RevId: 430726712 --- .../devtools/build/lib/rules/proto/ProtoConfiguration.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java index e8d2b90cbeed78..4c7ffbc61d0d0e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java @@ -201,6 +201,11 @@ public ProtoConfiguration(BuildOptions buildOptions) { this.options = options; } + @StarlarkMethod(name = "experimental_protoc_opts", structField = true, documented = false) + public ImmutableList protocOptsForStarlark() throws EvalException { + return protocOpts(); + } + public ImmutableList protocOpts() { return protocOpts; } From a6774156026cf8db69b60202738e235142b46bfc Mon Sep 17 00:00:00 2001 From: Ivo List Date: Fri, 4 Mar 2022 14:26:29 +0000 Subject: [PATCH 2/4] Cleanup --- .../devtools/build/lib/rules/proto/ProtoConfiguration.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java index 4c7ffbc61d0d0e..a2b7b1d4b1259f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java @@ -202,10 +202,6 @@ public ProtoConfiguration(BuildOptions buildOptions) { } @StarlarkMethod(name = "experimental_protoc_opts", structField = true, documented = false) - public ImmutableList protocOptsForStarlark() throws EvalException { - return protocOpts(); - } - public ImmutableList protocOpts() { return protocOpts; } From b32b304ee4fbdc14d628a6b3d497a75ecf0fb47d Mon Sep 17 00:00:00 2001 From: Ivo List Date: Fri, 4 Mar 2022 15:14:42 +0000 Subject: [PATCH 3/4] Add import. --- src/main/java/com/google/devtools/build/lib/rules/proto/BUILD | 1 + .../devtools/build/lib/rules/proto/ProtoConfiguration.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/BUILD b/src/main/java/com/google/devtools/build/lib/rules/proto/BUILD index 1067e484595629..8d6813236cae5b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/BUILD @@ -38,6 +38,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/analysis:rule_definition_environment", "//src/main/java/com/google/devtools/build/lib/analysis:transitive_info_collection", "//src/main/java/com/google/devtools/build/lib/analysis:transitive_info_provider", + "//src/main/java/com/google/devtools/build/lib/analysis/starlark/annotations", "//src/main/java/com/google/devtools/build/lib/analysis/stringtemplate", "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java index a2b7b1d4b1259f..6c4095cfad83b9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java @@ -21,6 +21,7 @@ import com.google.devtools.build.lib.analysis.config.Fragment; import com.google.devtools.build.lib.analysis.config.FragmentOptions; import com.google.devtools.build.lib.analysis.config.RequiresOptions; +import com.google.devtools.build.lib.analysis.starlark.annotations.StarlarkConfigurationField; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.starlarkbuildapi.ProtoConfigurationApi; From 68854aa59cb251b228bb6e4920a8b926f9fb7f29 Mon Sep 17 00:00:00 2001 From: Ivo List Date: Fri, 4 Mar 2022 15:44:22 +0000 Subject: [PATCH 4/4] Add the right import. --- src/main/java/com/google/devtools/build/lib/rules/proto/BUILD | 2 +- .../devtools/build/lib/rules/proto/ProtoConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/BUILD b/src/main/java/com/google/devtools/build/lib/rules/proto/BUILD index 8d6813236cae5b..6c45232c43407d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/BUILD @@ -38,7 +38,6 @@ java_library( "//src/main/java/com/google/devtools/build/lib/analysis:rule_definition_environment", "//src/main/java/com/google/devtools/build/lib/analysis:transitive_info_collection", "//src/main/java/com/google/devtools/build/lib/analysis:transitive_info_provider", - "//src/main/java/com/google/devtools/build/lib/analysis/starlark/annotations", "//src/main/java/com/google/devtools/build/lib/analysis/stringtemplate", "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", @@ -52,6 +51,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/vfs", "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment", "//src/main/java/com/google/devtools/common/options", + "//src/main/java/net/starlark/java/annot", "//src/main/java/net/starlark/java/eval", "//third_party:auto_value", "//third_party:guava", diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java index 6c4095cfad83b9..722b6ab41b1692 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java @@ -21,7 +21,6 @@ import com.google.devtools.build.lib.analysis.config.Fragment; import com.google.devtools.build.lib.analysis.config.FragmentOptions; import com.google.devtools.build.lib.analysis.config.RequiresOptions; -import com.google.devtools.build.lib.analysis.starlark.annotations.StarlarkConfigurationField; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.starlarkbuildapi.ProtoConfigurationApi; @@ -31,6 +30,7 @@ import com.google.devtools.common.options.OptionEffectTag; import com.google.devtools.common.options.OptionMetadataTag; import java.util.List; +import net.starlark.java.annot.StarlarkMethod; /** Configuration for Protocol Buffer Libraries. */ @Immutable