Revert "tools: allow building merger tool on Bazel"
This reverts commit 3778ccab8cee90daab808c1c52d709b73f49e5f7.
Reason for revert: breaks copybara roll to google3
Change-Id: I1cf50533fceb039f91b8de543e6d18fe270ba460
diff --git a/BUILD b/BUILD
index 1ef9c2d..2cfc776 100644
--- a/BUILD
+++ b/BUILD
@@ -186,22 +186,6 @@
] + PERFETTO_CONFIG.deps.protobuf_full,
)
-# GN target: //tools/proto_merger:proto_merger
-perfetto_cc_binary(
- name = "proto_merger",
- srcs = [
- "tools/proto_merger/allowlist.h",
- "tools/proto_merger/main.cc",
- "tools/proto_merger/proto_file.cc",
- "tools/proto_merger/proto_file.h",
- "tools/proto_merger/proto_merger.cc",
- "tools/proto_merger/proto_merger.h",
- ],
- deps = [
- ":src_base_base",
- ] + PERFETTO_CONFIG.deps.protobuf_full,
-)
-
# GN target: //:libperfetto
perfetto_cc_library(
name = "libperfetto",
diff --git a/tools/gen_bazel b/tools/gen_bazel
index 61396cc..5a80506 100755
--- a/tools/gen_bazel
+++ b/tools/gen_bazel
@@ -71,7 +71,6 @@
'//src/protozero/protoc_plugin:protozero_plugin',
'//src/protozero/protoc_plugin:cppgen_plugin',
'//tools/proto_filter:proto_filter',
- '//tools/proto_merger:proto_merger',
] + public_targets
# Root proto targets (to force discovery of intermediate proto targets).
diff --git a/tools/proto_merger/proto_merger.cc b/tools/proto_merger/proto_merger.cc
index c362d59..e9305d7 100644
--- a/tools/proto_merger/proto_merger.cc
+++ b/tools/proto_merger/proto_merger.cc
@@ -33,7 +33,6 @@
// Finds the given 'name' in the vector by comparing against
// the field named 'name' for each item in the vector.
-// T is ProtoFile::Enum, ProtoFile::Oneof or ProtoFile::Message.
template <typename T>
const T* FindByName(const std::vector<T>& items, const std::string& name) {
for (const auto& item : items) {
@@ -45,7 +44,6 @@
// Compute the items present in the |input| vector but deleted in
// the |upstream| vector by looking at the field |name|.
-// T is ProtoFile::Enum, ProtoFile::Oneof or ProtoFile::Message.
template <typename T>
std::vector<T> ComputeDeletedByName(const std::vector<T>& input,
const std::vector<T>& upstream) {
@@ -68,7 +66,6 @@
// Finds the given 'number' in the vector by comparing against
// the field named 'number for each item in the vector.
-// T is ProtoFile::EnumValue or ProtoFile::Field.
template <typename T>
const T* FindByNumber(const std::vector<T>& items, int number) {
for (const auto& item : items) {
@@ -80,7 +77,6 @@
// Compute the items present in the |input| vector but deleted in
// the |upstream| vector by looking at the field |number|.
-// T is ProtoFile::EnumValue or ProtoFile::Field.
template <typename T>
std::vector<T> ComputeDeletedByNumber(const std::vector<T>& input,
const std::vector<T>& upstream) {
