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
This commit is contained in:
Jeffrey Huang
2020-11-23 23:47:38 -08:00
parent e8e9fe5846
commit 4e671568fe
12 changed files with 34 additions and 12772 deletions

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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"

View File

@@ -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;