diff options
| author | Jeffrey Huang <jeffreyhuang@google.com> | 2020-11-24 10:57:06 -0800 |
|---|---|---|
| committer | Jeffrey Huang <jeffreyhuang@google.com> | 2020-11-24 10:57:06 -0800 |
| commit | 5d230a2d4992357ce49ed56c539f6f5f4751222b (patch) | |
| tree | f2de43036e1c83c8ae0eaef364c390f50eb95814 /tools | |
| parent | 72cb973ac1a8be4063139fa99e4995acdef9855e (diff) | |
Delete atoms.proto from statsd
Use the atoms.proto in proto_logging as the source of truth. Also
migrates statsd log api gen to use the new atoms.proto
Bug: 167962588
Test: m -j && m CtsStatsdAtomHostTestCases
Change-Id: I36ec354d273dceace5245d7634c68ac63dc5a8cd
Merged-In: I36ec354d273dceace5245d7634c68ac63dc5a8cd
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/stats_log_api_gen/Collation.cpp | 2 | ||||
| -rw-r--r-- | tools/stats_log_api_gen/Collation.h | 2 | ||||
| -rw-r--r-- | tools/stats_log_api_gen/main.cpp | 2 | ||||
| -rw-r--r-- | tools/stats_log_api_gen/test.proto | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tools/stats_log_api_gen/Collation.cpp b/tools/stats_log_api_gen/Collation.cpp index a230de46dcf3..2608097a359a 100644 --- a/tools/stats_log_api_gen/Collation.cpp +++ b/tools/stats_log_api_gen/Collation.cpp @@ -20,7 +20,7 @@ #include <map> -#include "frameworks/base/cmds/statsd/src/atoms.pb.h" +#include "frameworks/proto_logging/stats/atoms.pb.h" namespace android { namespace stats_log_api_gen { diff --git a/tools/stats_log_api_gen/Collation.h b/tools/stats_log_api_gen/Collation.h index 10b34ecf5f54..3deb3ae189a4 100644 --- a/tools/stats_log_api_gen/Collation.h +++ b/tools/stats_log_api_gen/Collation.h @@ -24,7 +24,7 @@ #include <set> #include <vector> -#include "frameworks/base/cmds/statsd/src/atom_field_options.pb.h" +#include "frameworks/proto_logging/stats/atom_field_options.pb.h" namespace android { namespace stats_log_api_gen { diff --git a/tools/stats_log_api_gen/main.cpp b/tools/stats_log_api_gen/main.cpp index b888ce904b31..416dfdd1ae10 100644 --- a/tools/stats_log_api_gen/main.cpp +++ b/tools/stats_log_api_gen/main.cpp @@ -9,7 +9,7 @@ #include <vector> #include "Collation.h" -#include "frameworks/base/cmds/statsd/src/atoms.pb.h" +#include "frameworks/proto_logging/stats/atoms.pb.h" #include "java_writer.h" #include "java_writer_q.h" #include "native_writer.h" diff --git a/tools/stats_log_api_gen/test.proto b/tools/stats_log_api_gen/test.proto index aaa488e44fee..a3ea78533a5e 100644 --- a/tools/stats_log_api_gen/test.proto +++ b/tools/stats_log_api_gen/test.proto @@ -16,8 +16,8 @@ syntax = "proto2"; -import "frameworks/base/cmds/statsd/src/atoms.proto"; -import "frameworks/base/cmds/statsd/src/atom_field_options.proto"; +import "frameworks/proto_logging/stats/atoms.proto"; +import "frameworks/proto_logging/stats/atom_field_options.proto"; package android.stats_log_api_gen; |