Internal change
PiperOrigin-RevId: 527024233
diff --git a/proto/BUILD b/proto/BUILD
index 37f3f30..67105f0 100644
--- a/proto/BUILD
+++ b/proto/BUILD
@@ -1,7 +1,5 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-package(default_applicable_licenses = ["//third_party/bazel_rules/rules_proto:license"])
-
bzl_library(
name = "defs",
srcs = [
diff --git a/proto/private/BUILD b/proto/private/BUILD
index 329c277..f45f4ed 100644
--- a/proto/private/BUILD
+++ b/proto/private/BUILD
@@ -1,7 +1,5 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-package(default_applicable_licenses = ["//third_party/bazel_rules/rules_proto:license"])
-
bzl_library(
name = "dependencies",
srcs = ["dependencies.bzl"],
diff --git a/proto/private/rules/BUILD b/proto/private/rules/BUILD
index d494f2f..a2fd159 100644
--- a/proto/private/rules/BUILD
+++ b/proto/private/rules/BUILD
@@ -1,7 +1,5 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-package(default_applicable_licenses = ["//third_party/bazel_rules/rules_proto:license"])
-
bzl_library(
name = "proto_descriptor_set",
srcs = [
diff --git a/tests/BUILD b/tests/BUILD
index 21569cc..2381713 100644
--- a/tests/BUILD
+++ b/tests/BUILD
@@ -1,7 +1,5 @@
load("//proto:defs.bzl", "proto_library")
-package(default_applicable_licenses = ["//third_party/bazel_rules/rules_proto:license"])
-
proto_library(
name = "empty_proto",
srcs = [
diff --git a/tests/load_from_macro/BUILD b/tests/load_from_macro/BUILD
index f051ba2..0c881f1 100644
--- a/tests/load_from_macro/BUILD
+++ b/tests/load_from_macro/BUILD
@@ -17,8 +17,6 @@
load("//proto:defs.bzl", "proto_library")
load(":tags.bzl", "TAGS")
-package(default_applicable_licenses = ["//third_party/bazel_rules/rules_proto:license"])
-
proto_library(
name = "foo",
srcs = ["foo.proto"],
diff --git a/tests/rules/proto_descriptor_set/BUILD b/tests/rules/proto_descriptor_set/BUILD
index 77fe3cb..69dee08 100644
--- a/tests/rules/proto_descriptor_set/BUILD
+++ b/tests/rules/proto_descriptor_set/BUILD
@@ -1,8 +1,6 @@
load("@rules_cc//cc:defs.bzl", "cc_test")
load("//proto:defs.bzl", "proto_descriptor_set", "proto_library")
-package(default_applicable_licenses = ["//third_party/bazel_rules/rules_proto:license"])
-
proto_library(
name = "empty_proto_library",
)
diff --git a/tests/rules/proto_descriptor_set/proto_descriptor_set_test.cc b/tests/rules/proto_descriptor_set/proto_descriptor_set_test.cc
index 3044e4c..d17d0ea 100644
--- a/tests/rules/proto_descriptor_set/proto_descriptor_set_test.cc
+++ b/tests/rules/proto_descriptor_set/proto_descriptor_set_test.cc
@@ -19,11 +19,11 @@
#include <string>
#include <vector>
-#include "google/protobuf/descriptor.proto.h"
-#include "gtest/gtest.h"
-#include "testing/base/public/gmock.h"
-#include "tests/utils/workspace_constants.h"
#include "tools/cpp/runfiles/runfiles.h"
+#include "google/protobuf/descriptor.pb.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "tests/utils/workspace_constants.h"
using bazel::tools::cpp::runfiles::Runfiles;
using google::protobuf::FileDescriptorProto;
@@ -34,7 +34,8 @@
std::string GetRlocation(const std::string& file) {
static std::unique_ptr<Runfiles> runfiles(Runfiles::CreateForTest());
- std::string path = runfiles->Rlocation(rulesproto::kWorkspaceRlocation + file);
+ std::string path =
+ runfiles->Rlocation(rulesproto::kWorkspaceRlocation + file);
std::ifstream input(path, std::ifstream::binary);
if (!input) {
path = runfiles->Rlocation(rulesproto::kWorkspaceRlocationBzlmod + file);
@@ -61,8 +62,8 @@
unordered_proto_files.insert(file_descriptor.name());
}
- std::vector<std::string> proto_files(
- unordered_proto_files.begin(), unordered_proto_files.end());
+ std::vector<std::string> proto_files(unordered_proto_files.begin(),
+ unordered_proto_files.end());
std::sort(proto_files.begin(), proto_files.end());
return proto_files;
}
@@ -71,9 +72,9 @@
const std::string& path,
const std::vector<std::string>& expected_proto_files) {
std::vector<std::string> actual_proto_files =
- ReadFileDescriptorSet(
- GetRlocation(path));
- EXPECT_THAT(actual_proto_files, ::testing::IsSupersetOf(expected_proto_files));
+ ReadFileDescriptorSet(GetRlocation(path));
+ EXPECT_THAT(actual_proto_files,
+ ::testing::IsSupersetOf(expected_proto_files));
}
} // namespace
@@ -89,7 +90,7 @@
{
"google/protobuf/any.proto",
"google/protobuf/api.proto",
- "google/protobuf/descriptor.proto",
+ "google/protobuf/descriptor.pb",
"google/protobuf/duration.proto",
"google/protobuf/empty.proto",
"google/protobuf/field_mask.proto",
diff --git a/tests/utils/BUILD b/tests/utils/BUILD
index f61c1fa..a39fbe6 100644
--- a/tests/utils/BUILD
+++ b/tests/utils/BUILD
@@ -1,7 +1,5 @@
load("@rules_cc//cc:defs.bzl", "cc_library")
-package(default_applicable_licenses = ["//third_party/bazel_rules/rules_proto:license"])
-
cc_library(
name = "workspace_constants",
testonly = True,
diff --git a/tools/file_concat/BUILD b/tools/file_concat/BUILD
index f217599..be649fe 100644
--- a/tools/file_concat/BUILD
+++ b/tools/file_concat/BUILD
@@ -1,7 +1,5 @@
load("@rules_cc//cc:defs.bzl", "cc_binary")
-package(default_applicable_licenses = ["//third_party/bazel_rules/rules_proto:license"])
-
cc_binary(
name = "file_concat",
srcs = [
