diff options
| author | Aaron Vaage <vaage@google.com> | 2024-04-17 20:08:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-17 20:08:34 +0000 |
| commit | 03193a44ad24c622338c62df57073ef06511fc06 (patch) | |
| tree | 6b0414c03169b39e6ddd024bae6e82ebf4e19a65 | |
| parent | 1680cc2d5766c05992d2c452a72235c6aab0e9a5 (diff) | |
| parent | d45277471423d9ecee90995567a7f7e09a2265c2 (diff) | |
| download | perfetto-03193a44ad24c622338c62df57073ef06511fc06.tar.gz | |
Merge "Trace Redaction - Fix indirect include" into main
| -rw-r--r-- | src/trace_redaction/BUILD.gn | 1 | ||||
| -rw-r--r-- | src/trace_redaction/filter_packet_using_allowlist_unittest.cc | 1 | ||||
| -rw-r--r-- | src/trace_redaction/trace_redaction_framework.h | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/src/trace_redaction/BUILD.gn b/src/trace_redaction/BUILD.gn index 27b9c9d94..be268d72e 100644 --- a/src/trace_redaction/BUILD.gn +++ b/src/trace_redaction/BUILD.gn @@ -140,6 +140,7 @@ perfetto_unittest_source_set("unittests") { ":trace_redaction", "../../gn:default_deps", "../../gn:gtest_and_gmock", + "../../include/perfetto/ext/base:base", "../../include/perfetto/protozero:protozero", "../../protos/perfetto/config:cpp", "../../protos/perfetto/config:zero", diff --git a/src/trace_redaction/filter_packet_using_allowlist_unittest.cc b/src/trace_redaction/filter_packet_using_allowlist_unittest.cc index ffdb99f00..25b227220 100644 --- a/src/trace_redaction/filter_packet_using_allowlist_unittest.cc +++ b/src/trace_redaction/filter_packet_using_allowlist_unittest.cc @@ -16,6 +16,7 @@ #include <string> +#include "perfetto/ext/base/status_or.h" #include "src/base/test/status_matchers.h" #include "src/trace_redaction/filter_packet_using_allowlist.h" #include "src/trace_redaction/scrub_trace_packet.h" diff --git a/src/trace_redaction/trace_redaction_framework.h b/src/trace_redaction/trace_redaction_framework.h index c76a65101..f741f9b6f 100644 --- a/src/trace_redaction/trace_redaction_framework.h +++ b/src/trace_redaction/trace_redaction_framework.h @@ -24,7 +24,6 @@ #include "perfetto/base/flat_set.h" #include "perfetto/base/status.h" -#include "perfetto/ext/base/status_or.h" #include "src/trace_redaction/process_thread_timeline.h" #include "protos/perfetto/trace/trace_packet.pbzero.h" |