From 5d230a2d4992357ce49ed56c539f6f5f4751222b Mon Sep 17 00:00:00 2001 From: Jeffrey Huang Date: Tue, 24 Nov 2020 10:57:06 -0800 Subject: 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 --- tools/stats_log_api_gen/Collation.cpp | 2 +- tools/stats_log_api_gen/Collation.h | 2 +- tools/stats_log_api_gen/main.cpp | 2 +- tools/stats_log_api_gen/test.proto | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tools') 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 -#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 #include -#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 #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; -- cgit v1.2.3