Rename "lib/" to "quic_trace/" C++ built with Bazel uses repository-relative paths, meaning that "lib/quic_trace.pb.h" is ambiguous.
diff --git a/README.md b/README.md index cb8d6cb..5bdd90f 100644 --- a/README.md +++ b/README.md
@@ -13,8 +13,8 @@ ## How to record this format The traces are represented as a Protocol Buffer, which is completely described -in `lib/quic_trace.proto`. Projects that use Bazel can embed this repository -directly and use the provided Bazel rules. +in `quic_trace/quic_trace.proto`. Projects that use Bazel can embed this +repository directly and use the provided Bazel rules. ## OpenGL-based renderer
diff --git a/lib/BUILD b/quic_trace/BUILD similarity index 100% rename from lib/BUILD rename to quic_trace/BUILD
diff --git a/lib/analysis/BUILD b/quic_trace/analysis/BUILD similarity index 94% rename from lib/analysis/BUILD rename to quic_trace/analysis/BUILD index 0e0f107..cb84cfc 100644 --- a/lib/analysis/BUILD +++ b/quic_trace/analysis/BUILD
@@ -22,7 +22,7 @@ name = "numbering", hdrs = ["trace_numbering.h"], deps = [ - "//lib:quic_trace_cc_proto", + "//quic_trace:quic_trace_cc_proto", "@com_google_absl//absl/container:flat_hash_map", "@com_google_glog//:glog", ],
diff --git a/lib/analysis/trace_numbering.h b/quic_trace/analysis/trace_numbering.h similarity index 98% rename from lib/analysis/trace_numbering.h rename to quic_trace/analysis/trace_numbering.h index fa390cf..8cffeda 100644 --- a/lib/analysis/trace_numbering.h +++ b/quic_trace/analysis/trace_numbering.h
@@ -23,7 +23,7 @@ #include <unordered_map> #include "absl/container/flat_hash_map.h" -#include "lib/quic_trace.pb.h" +#include "quic_trace/quic_trace.pb.h" namespace quic_trace {
diff --git a/lib/quic_trace.proto b/quic_trace/quic_trace.proto similarity index 100% rename from lib/quic_trace.proto rename to quic_trace/quic_trace.proto
diff --git a/tools/BUILD b/tools/BUILD index cc8ec3d..7b4e441 100644 --- a/tools/BUILD +++ b/tools/BUILD
@@ -18,7 +18,7 @@ name = "quic_trace_to_time_sequence_gnuplot", srcs = ["quic_trace_to_time_sequence_gnuplot.cc"], deps = [ - "//lib:quic_trace_cc_proto", + "//quic_trace:quic_trace_cc_proto", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/flags:flag", @@ -30,7 +30,7 @@ name = "transform_quic_trace", srcs = ["transform_quic_trace.cc"], deps = [ - "//lib:quic_trace_cc_proto", + "//quic_trace:quic_trace_cc_proto", "@com_google_absl//absl/flags:flag", "@com_google_absl//absl/flags:parse", "@com_google_absl//absl/strings",
diff --git a/tools/quic_trace_to_time_sequence_gnuplot.cc b/tools/quic_trace_to_time_sequence_gnuplot.cc index dfa5d95..42bdaf3 100644 --- a/tools/quic_trace_to_time_sequence_gnuplot.cc +++ b/tools/quic_trace_to_time_sequence_gnuplot.cc
@@ -22,7 +22,7 @@ #include "absl/container/flat_hash_set.h" #include "absl/flags/flag.h" #include "absl/flags/parse.h" -#include "lib/quic_trace.pb.h" +#include "quic_trace/quic_trace.pb.h" ABSL_FLAG(std::string, sequence,
diff --git a/tools/render/BUILD b/tools/render/BUILD index 7f381c6..dd46504 100644 --- a/tools/render/BUILD +++ b/tools/render/BUILD
@@ -76,8 +76,8 @@ ], deps = [ ":render_core", - "//lib:quic_trace_cc_proto", - "//lib/analysis:numbering", + "//quic_trace:quic_trace_cc_proto", + "//quic_trace/analysis:numbering", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set",
diff --git a/tools/render/processed_trace.h b/tools/render/processed_trace.h index 609f134..2530103 100644 --- a/tools/render/processed_trace.h +++ b/tools/render/processed_trace.h
@@ -17,8 +17,8 @@ #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" -#include "lib/analysis/trace_numbering.h" -#include "lib/quic_trace.pb.h" +#include "quic_trace/analysis/trace_numbering.h" +#include "quic_trace/quic_trace.pb.h" #include "tools/render/table.h" #include "tools/render/trace_renderer.h"
diff --git a/tools/render/trace_program.h b/tools/render/trace_program.h index 590d626..f0699f1 100644 --- a/tools/render/trace_program.h +++ b/tools/render/trace_program.h
@@ -16,7 +16,7 @@ #define THIRD_PARTY_QUIC_TRACE_TOOLS_TRACE_PROGRAM_H_ #include "absl/time/time.h" -#include "lib/quic_trace.pb.h" +#include "quic_trace/quic_trace.pb.h" #include "tools/render/axis_renderer.h" #include "tools/render/processed_trace.h" #include "tools/render/program_state.h"
diff --git a/tools/transform_quic_trace.cc b/tools/transform_quic_trace.cc index 1513f4a..4af96e5 100644 --- a/tools/transform_quic_trace.cc +++ b/tools/transform_quic_trace.cc
@@ -23,7 +23,7 @@ #include "absl/flags/parse.h" #include "absl/strings/string_view.h" #include "google/protobuf/util/json_util.h" -#include "lib/quic_trace.pb.h" +#include "quic_trace/quic_trace.pb.h" ABSL_FLAG(bool, whitespace, true, "Add whitespace to the JSON output"); ABSL_FLAG(std::string,