diff options
| author | Jeffrey Huang <jeffreyhuang@google.com> | 2020-11-24 21:53:20 +0000 |
|---|---|---|
| committer | Jeffrey Huang <jeffreyhuang@google.com> | 2020-11-24 21:53:20 +0000 |
| commit | e8552cd24a5ba2f894ba99ca5db1135ceb342b81 (patch) | |
| tree | 7d832b50f8a8a1b23b0ebddc48f9cd65176c82cb /tools | |
| parent | 5d230a2d4992357ce49ed56c539f6f5f4751222b (diff) | |
Revert "Delete atoms.proto from statsd"
Revert "Add android bp to proto_logging"
Revert submission 1508746-delete_atoms
Reason for revert: Build Failure
Reverted Changes:
I184cf8bf8:Add android bp to proto_logging
I36ec354d2:Delete atoms.proto from statsd
Change-Id: Ifec6a57d66cbd9c37503ca47847c3ae492f3d343
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 2608097a359a..a230de46dcf3 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/proto_logging/stats/atoms.pb.h" +#include "frameworks/base/cmds/statsd/src/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 3deb3ae189a4..10b34ecf5f54 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/proto_logging/stats/atom_field_options.pb.h" +#include "frameworks/base/cmds/statsd/src/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 416dfdd1ae10..b888ce904b31 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/proto_logging/stats/atoms.pb.h" +#include "frameworks/base/cmds/statsd/src/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 a3ea78533a5e..aaa488e44fee 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/proto_logging/stats/atoms.proto"; -import "frameworks/proto_logging/stats/atom_field_options.proto"; +import "frameworks/base/cmds/statsd/src/atoms.proto"; +import "frameworks/base/cmds/statsd/src/atom_field_options.proto"; package android.stats_log_api_gen; |