commit ccb645bb5ed8643b23818900a03268e19f1b7c51
author Jeffrey Huang <jeffreyhuang@google.com> Tue Nov 24 22:28:38 2020 +0000
committer Jeffrey Huang <jeffreyhuang@google.com> Tue Nov 24 22:28:38 2020 +0000
tree 7f1550d7f18bbb8226f3bc45c1d70d078d01e126
parent 9503be06adedbcc5404c51c3102e5f80167f3b65

Revert^2 "Delete atoms.proto from statsd"

9503be06adedbcc5404c51c3102e5f80167f3b65

Change-Id: I81a8287ed5b055e7b6547794d01e7ac897f0f022

stats/stats_log_api_gen/Collation.cpp

diff --git a/stats/stats_log_api_gen/Collation.cpp b/stats/stats_log_api_gen/Collation.cpp
index fe6ca55..56f4db0 100644
--- a/stats/stats_log_api_gen/Collation.cpp
+++ b/stats/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 {

stats/stats_log_api_gen/Collation.h

diff --git a/stats/stats_log_api_gen/Collation.h b/stats/stats_log_api_gen/Collation.h
index 5d196c4..b13851c 100644
--- a/stats/stats_log_api_gen/Collation.h
+++ b/stats/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 {

stats/stats_log_api_gen/main.cpp

diff --git a/stats/stats_log_api_gen/main.cpp b/stats/stats_log_api_gen/main.cpp
index 2830249..50f8176 100644
--- a/stats/stats_log_api_gen/main.cpp
+++ b/stats/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"

stats/stats_log_api_gen/test.proto

diff --git a/stats/stats_log_api_gen/test.proto b/stats/stats_log_api_gen/test.proto
index e658b62..18c52bf 100644
--- a/stats/stats_log_api_gen/test.proto
+++ b/stats/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;