pw_log: Move pw_log proto Declare log.proto in pw_log rather than pw_log_proto. The log proto is properly part of pw_log, rather than a standalone module. Change-Id: I853f28b36a41a2a94564d61ea2e916d9c21076c3 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/47220 Reviewed-by: Ewout van Bekkum <ewout@google.com> Commit-Queue: Wyatt Hepler <hepler@google.com>
diff --git a/pw_log/BUILD.gn b/pw_log/BUILD.gn index 52082bc..2b73b97 100644 --- a/pw_log/BUILD.gn +++ b/pw_log/BUILD.gn
@@ -76,7 +76,8 @@ } pw_proto_library("protos") { - sources = [ "pw_log_proto/log.proto" ] + sources = [ "log.proto" ] + prefix = "pw_log/proto" } pw_doc_group("docs") {
diff --git a/pw_log/pw_log_proto/log.proto b/pw_log/log.proto similarity index 100% rename from pw_log/pw_log_proto/log.proto rename to pw_log/log.proto
diff --git a/pw_log_multisink/log_queue.cc b/pw_log_multisink/log_queue.cc index 191c477..f5b3436 100644 --- a/pw_log_multisink/log_queue.cc +++ b/pw_log_multisink/log_queue.cc
@@ -16,7 +16,7 @@ #include "pw_assert/check.h" #include "pw_log/levels.h" -#include "pw_log_proto/log.pwpb.h" +#include "pw_log/proto/log.pwpb.h" #include "pw_protobuf/wire_format.h" #include "pw_status/try.h"
diff --git a/pw_log_multisink/log_queue_test.cc b/pw_log_multisink/log_queue_test.cc index fc75706..05bc62a 100644 --- a/pw_log_multisink/log_queue_test.cc +++ b/pw_log_multisink/log_queue_test.cc
@@ -16,7 +16,7 @@ #include "gtest/gtest.h" #include "pw_log/levels.h" -#include "pw_log_proto/log.pwpb.h" +#include "pw_log/proto/log.pwpb.h" #include "pw_protobuf/decoder.h" namespace pw::log_rpc {
diff --git a/pw_log_rpc/logs_rpc.cc b/pw_log_rpc/logs_rpc.cc index c790b22..bf5f352 100644 --- a/pw_log_rpc/logs_rpc.cc +++ b/pw_log_rpc/logs_rpc.cc
@@ -15,7 +15,7 @@ #include "pw_log_rpc/logs_rpc.h" #include "pw_log/log.h" -#include "pw_log_proto/log.pwpb.h" +#include "pw_log/proto/log.pwpb.h" #include "pw_status/try.h" namespace pw::log_rpc {
diff --git a/pw_log_rpc/public/pw_log_rpc/logs_rpc.h b/pw_log_rpc/public/pw_log_rpc/logs_rpc.h index 0e3d0fd..71a56dc 100644 --- a/pw_log_rpc/public/pw_log_rpc/logs_rpc.h +++ b/pw_log_rpc/public/pw_log_rpc/logs_rpc.h
@@ -15,8 +15,8 @@ #pragma once #include "pw_log/log.h" +#include "pw_log/proto/log.raw_rpc.pb.h" #include "pw_log_multisink/log_queue.h" -#include "pw_log_proto/log.raw_rpc.pb.h" namespace pw::log_rpc {
diff --git a/pw_log_sink/log_sink.cc b/pw_log_sink/log_sink.cc index 774c390..4d841e8 100644 --- a/pw_log_sink/log_sink.cc +++ b/pw_log_sink/log_sink.cc
@@ -19,7 +19,7 @@ #include <mutex> #include "pw_log/levels.h" -#include "pw_log_proto/log.pwpb.h" +#include "pw_log/proto/log.pwpb.h" #include "pw_protobuf/wire_format.h" #include "pw_status/try.h" #include "pw_string/string_builder.h"
diff --git a/pw_log_sink/log_sink_test.cc b/pw_log_sink/log_sink_test.cc index 05ee925..f3432c1 100644 --- a/pw_log_sink/log_sink_test.cc +++ b/pw_log_sink/log_sink_test.cc
@@ -18,7 +18,7 @@ #include "gtest/gtest.h" #include "pw_log/levels.h" -#include "pw_log_proto/log.pwpb.h" +#include "pw_log/proto/log.pwpb.h" #include "pw_log_sink/multisink_adapter.h" #include "pw_multisink/multisink.h" #include "pw_protobuf/decoder.h"
diff --git a/pw_snapshot/pw_snapshot_protos/snapshot.proto b/pw_snapshot/pw_snapshot_protos/snapshot.proto index e09c637..03030a7 100644 --- a/pw_snapshot/pw_snapshot_protos/snapshot.proto +++ b/pw_snapshot/pw_snapshot_protos/snapshot.proto
@@ -19,7 +19,7 @@ option java_outer_classname = "Snapshot"; import "pw_cpu_exception_cortex_m_protos/cpu_state.proto"; -import "pw_log_proto/log.proto"; +import "pw_log/proto/log.proto"; import "pw_thread_protos/thread.proto"; import "pw_snapshot_metadata_proto/snapshot_metadata.proto";