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:
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user