fixup! Merge remote-tracking branch 'upstream/main' into remove-cc-defs

rickeylev · rickeylev · commit c500a69cf223 · 2024-11-13T18:45:06.000-08:00
diff --git a/internal_deps.bzl b/internal_deps.bzl
@@ -241,6 +241,7 @@ def rules_python_internal_deps():
         strip_prefix = "protobuf-27.0",
         url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz",
     )
+
     # Needed by rules_cc, triggered by @rules_java_builtins from Bazel
     http_archive(
         name = "protobuf",
diff --git a/python/private/py_repositories.bzl b/python/private/py_repositories.bzl
@@ -67,6 +67,7 @@ def py_repositories():
         strip_prefix = "protobuf-27.0",
         url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz",
     )
+
     # Needed by rules_cc, triggerred by @rules_java_prebuilt in Bazel by using @rules_cc//cc:defs.bzl
     http_archive(
         name = "protobuf",

Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,7 @@ def rules_python_internal_deps():`
`241`	`241`	`strip_prefix = "protobuf-27.0",`
`242`	`242`	`url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz",`
`243`	`243`	`)`
	`244`	`+`
`244`	`245`	`# Needed by rules_cc, triggered by @rules_java_builtins from Bazel`
`245`	`246`	`http_archive(`
`246`	`247`	`name = "protobuf",`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ def py_repositories():`
`67`	`67`	`strip_prefix = "protobuf-27.0",`
`68`	`68`	`url = "https://github.com/protocolbuffers/protobuf/releases/download/v27.0/protobuf-27.0.tar.gz",`
`69`	`69`	`)`
	`70`	`+`
`70`	`71`	`# Needed by rules_cc, triggerred by @rules_java_prebuilt in Bazel by using @rules_cc//cc:defs.bzl`
`71`	`72`	`http_archive(`
`72`	`73`	`name = "protobuf",`