Use prebuilt protoc

Author: agluszak

.bazelrc

@@ -28,3 +28,10 @@ build:windows --define=protobuf_allow_msvc=true
 
 common --enable_platform_specific_config
 
+# Use prebuilt protoc
+common --incompatible_enable_proto_toolchain_resolution
+common --@com_google_protobuf//bazel/toolchains:prefer_prebuilt_protoc=true
+common --per_file_copt=external/.*protobuf.*@--PROTOBUF_WAS_NOT_SUPPOSED_TO_BE_BUILT
+common --host_per_file_copt=external/.*protobuf.*@--PROTOBUF_WAS_NOT_SUPPOSED_TO_BE_BUILT
+common --per_file_copt=external/.*grpc.*@--GRPC_WAS_NOT_SUPPOSED_TO_BE_BUILT
+common --host_per_file_copt=external/.*grpc.*@--GRPC_WAS_NOT_SUPPOSED_TO_BE_BUILT

MODULE.bazel

@@ -15,7 +15,7 @@ bazel_dep(name = "stardoc", version = "0.8.0", dev_dependency = True)
 rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
 use_repo(rules_java_toolchains, "remote_java_tools")
 
-bazel_dep(name = "protobuf", version = "33.1", repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")
 bazel_dep(name = "rules_jvm_external", version = "6.9")
 bazel_dep(name = "bazel_skylib", version = "1.8.1")
 bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric")
@@ -54,9 +54,6 @@ python.toolchain(
     python_version = "3.11",
 )
 
-# proto-related dependency setup
-bazel_dep(name = "rules_proto", version = "7.1.0", repo_name = "rules_proto")
-
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 # Maven for android_ide_common need to be separated into their own separate maven_install for now
 # due to compatibility issues with newer versions.
@@ -78,8 +75,8 @@ maven.install(
         # These technically aren't needed, but the protobuf version pulled
         # in by these older deps has compatibility issues with the newer
         # protobuf runtimes.
-        "com.google.protobuf:protobuf-java:4.33.1",
-        "com.google.protobuf:protobuf-java-util:4.33.1",
+        "com.google.protobuf:protobuf-java:4.33.4",
+        "com.google.protobuf:protobuf-java-util:4.33.4",
     ],
     repositories = [
         "https://maven.google.com",
@@ -117,8 +114,9 @@ maven.install(
         "jakarta.inject:jakarta.inject-api:2.0.1",
         "junit:junit:4.13.2",
         "com.beust:jcommander:1.82",
-        "com.google.protobuf:protobuf-java:4.33.1",
-        "com.google.protobuf:protobuf-java-util:4.33.1",
+        # Override transitive protobuf deps to match bazel_dep protobuf version.
+        "com.google.protobuf:protobuf-java:4.33.4",
+        "com.google.protobuf:protobuf-java-util:4.33.4",
         "com.google.code.findbugs:jsr305:3.0.2",
         "androidx.databinding:databinding-compiler:8.7.0",
         "org.ow2.asm:asm:9.6",

defs.bzl

@@ -24,9 +24,6 @@ load(
 )
 load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
 load("@rules_jvm_external//:defs.bzl", "maven_install")
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
-load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
-load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
 load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
 load("@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", "rules_shell_toolchains")
 
@@ -54,11 +51,6 @@ def rules_android_workspace():
             "com.android.tools:sdk-common:30.1.3",
             "com.android.tools.build:builder:7.1.3",
             "com.android.tools.build:builder-model:7.1.3",
-            # These technically aren't needed, but the protobuf version pulled
-            # in by these older deps has compatibility issues with the newer
-            # protobuf runtimes.
-            "com.google.protobuf:protobuf-java:4.33.1",
-            "com.google.protobuf:protobuf-java-util:4.33.1",
         ],
         repositories = [
             "https://maven.google.com",
@@ -94,8 +86,6 @@ def rules_android_workspace():
             "jakarta.inject:jakarta.inject-api:2.0.1",
             "junit:junit:4.13.2",
             "com.beust:jcommander:1.82",
-            "com.google.protobuf:protobuf-java:4.33.1",
-            "com.google.protobuf:protobuf-java-util:4.33.1",
             "com.google.code.findbugs:jsr305:3.0.2",
             "androidx.databinding:databinding-compiler:8.7.0",
             "org.ow2.asm:asm:9.6",
@@ -204,10 +194,6 @@ def rules_android_workspace():
 
     robolectric_repositories()
 
-    rules_proto_dependencies()
-    rules_proto_toolchains()
-    rules_proto_setup()
-
     py_repositories()
 
     python_register_toolchains(

prereqs.bzl

@@ -63,8 +63,8 @@ def rules_android_prereqs(dev_mode = False):
         url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (RULES_JVM_EXTERNAL_TAG, RULES_JVM_EXTERNAL_TAG),
     )
 
-    PROTOBUF_VERSION = "33.1"
-    PROTOBUF_HASH = "fda132cb0c86400381c0af1fe98bd0f775cb566cb247cdcc105e344e00acc30e"
+    PROTOBUF_VERSION = "33.4"
+    PROTOBUF_HASH = "bc670a4e34992c175137ddda24e76562bb928f849d712a0e3c2fb2e19249bea1"
     maybe(
         http_archive,
         name = "com_google_protobuf",

src/tools/java/com/google/devtools/build/android/BUILD

@@ -98,7 +98,7 @@ java_library(
         "@rules_android_maven//:com_google_code_findbugs_jsr305",
         "@rules_android_maven//:com_google_errorprone_error_prone_annotations",
         "@rules_android_maven//:com_google_guava_guava",
-        "@rules_android_maven//:com_google_protobuf_protobuf_java",
+        "@com_google_protobuf//java/core",
         ":android_common_30_1_3",
         ":android_databinding_wrapper_lib",
         ":android_options_utils",

src/tools/java/com/google/devtools/build/android/desugar/langmodel/BUILD

@@ -19,7 +19,7 @@ java_library(
         "@rules_android_maven//:com_google_code_findbugs_jsr305",
         "@rules_android_maven//:com_google_errorprone_error_prone_annotations",
         "@rules_android_maven//:com_google_guava_guava",
-        "@rules_android_maven//:com_google_protobuf_protobuf_java",
+        "@com_google_protobuf//java/core",
         "@rules_android_maven//:org_ow2_asm_asm",
         "@rules_android_maven//:org_ow2_asm_asm_commons",
         "@rules_android_maven//:org_ow2_asm_asm_tree",

src/tools/java/com/google/devtools/build/android/proto/BUILD

@@ -1,7 +1,7 @@
 # Protos of the Actions for Android rules.
 
 load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 
 package(default_visibility = ["//visibility:public"])
 

src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/info/BUILD

@@ -13,7 +13,7 @@ java_library(
     srcs = glob(["*.java"]),
     deps = [
         "@rules_android_maven//:com_android_tools_build_bundletool",
-        "@rules_android_maven//:com_google_protobuf_protobuf_java",
-        "@rules_android_maven//:com_google_protobuf_protobuf_java_util",
+        "@com_google_protobuf//java/core",
+        "@com_google_protobuf//java/util",
     ],
 )

src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/runtimeenabledsdkconfig/BUILD

@@ -16,7 +16,7 @@ java_library(
         "//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/mixin",
         "@rules_android_maven//:com_android_tools_build_bundletool",
         "@rules_android_maven//:com_google_guava_guava",
-        "@rules_android_maven//:com_google_protobuf_protobuf_java",
+        "@com_google_protobuf//java/core",
         "@rules_android_maven//:info_picocli_picocli",
     ],
 )

src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdksplitproperties/BUILD

@@ -16,8 +16,8 @@ java_library(
         "//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/mixin",
         "@rules_android_maven//:com_android_tools_build_bundletool",
         "@rules_android_maven//:com_google_guava_guava",
-        "@rules_android_maven//:com_google_protobuf_protobuf_java",
-        "@rules_android_maven//:com_google_protobuf_protobuf_java_util",
+        "@com_google_protobuf//java/core",
+        "@com_google_protobuf//java/util",
         "@rules_android_maven//:info_picocli_picocli",
     ],
 )