Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert^2 "Delete atoms.proto from statsd"" am: e72a1eb1eb

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510611

Change-Id: I2a9ff1e9a4eb1022a25b5a959a68f0f28ecf770f
This commit is contained in:
Baligh Uddin
2020-11-25 06:46:40 +00:00
committed by Automerger Merge Worker
parent 85056fca49 e72a1eb1eb
commit 919a826dc8
10 changed files with 29 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Android.bp
View File

@@ -812,13 +812,17 @@ java_library_host {
name: "platformprotos",
srcs: [
":ipconnectivity-proto-src",
":libstats_internal_protos",
"cmds/am/proto/instrumentation_data.proto",
"cmds/statsd/src/**/*.proto",
"core/proto/**/*.proto",
"libs/incident/proto/**/*.proto",
],
proto: {
include_dirs: ["external/protobuf/src"],
include_dirs: [
"external/protobuf/src",
"frameworks/proto_logging/stats",
],
type: "full",
},
errorprone: {

51
cmds/statsd/Android.bp
View File

@@ -14,34 +14,6 @@
// limitations under the License.
//
// ==========================================================
// Build the library for use on the host
// ==========================================================
cc_library_host_shared {
name: "libstats_proto_host",
srcs: [
"src/atoms.proto",
"src/atom_field_options.proto",
],
shared_libs: [
"libplatformprotos",
],
proto: {
type: "full",
export_proto_headers: true,
include_dirs: [
"external/protobuf/src",
],
},
export_shared_lib_headers: [
"libplatformprotos",
]
}
cc_defaults {
name: "statsd_defaults",
@@ -275,9 +247,8 @@ cc_test {
// atom_field_options.proto needs field_options.proto, but that is
// not included in libprotobuf-cpp-lite, so compile it here.
":libprotobuf-internal-protos",
":libstats_internal_protos",
"src/atom_field_options.proto",
"src/atoms.proto",
"src/shell/shell_data.proto",
"src/stats_log.proto",
"tests/AlarmMonitor_test.cpp",
@@ -341,7 +312,10 @@ cc_test {
proto: {
type: "lite",
include_dirs: ["external/protobuf/src"],
include_dirs: [
"external/protobuf/src",
"frameworks/proto_logging/stats",
],
},
}
@@ -358,6 +332,7 @@ cc_benchmark {
// atom_field_options.proto needs field_options.proto, but that is
// not included in libprotobuf-cpp-lite, so compile it here.
":libprotobuf-internal-protos",
":libstats_internal_protos",
"benchmark/duration_metric_benchmark.cpp",
"benchmark/filter_value_benchmark.cpp",
@@ -367,14 +342,15 @@ cc_benchmark {
"benchmark/main.cpp",
"benchmark/metric_util.cpp",
"benchmark/stats_write_benchmark.cpp",
"src/atom_field_options.proto",
"src/atoms.proto",
"src/stats_log.proto",
],
proto: {
type: "lite",
include_dirs: ["external/protobuf/src"],
include_dirs: [
"external/protobuf/src",
"frameworks/proto_logging/stats",
],
},
cflags: [
@@ -406,11 +382,14 @@ java_library {
sdk_version: "core_current",
proto: {
type: "lite",
include_dirs: ["external/protobuf/src"],
include_dirs: [
"external/protobuf/src",
"frameworks/proto_logging/stats",
],
},
srcs: [
"src/atoms.proto",
":libstats_atoms_proto",
"src/shell/shell_config.proto",
"src/shell/shell_data.proto",
"src/stats_log.proto",

2
cmds/statsd/src/shell/shell_data.proto
View File

@@ -21,7 +21,7 @@ package android.os.statsd;
option java_package = "com.android.os.statsd";
option java_outer_classname = "ShellDataProto";
import "frameworks/base/cmds/statsd/src/atoms.proto";
import "frameworks/proto_logging/stats/atoms.proto";
// The output of shell subscription, including both pulled and pushed subscriptions.
message ShellData {

2
cmds/statsd/src/stats_log.proto
View File

@@ -21,7 +21,7 @@ package android.os.statsd;
option java_package = "com.android.os";
option java_outer_classname = "StatsLog";
import "frameworks/base/cmds/statsd/src/atoms.proto";
import "frameworks/proto_logging/stats/atoms.proto";
message DimensionsValue {
optional int32 field = 1;

2
cmds/statsd/tests/LogEvent_test.cpp
View File

@@ -16,8 +16,8 @@
#include <gtest/gtest.h>
#include "frameworks/base/cmds/statsd/src/atoms.pb.h"
#include "frameworks/base/core/proto/android/stats/launcher/launcher.pb.h"
#include "frameworks/proto_logging/stats/atoms.pb.h"
#include "log/log_event_list.h"
#include "stats_event.h"

2
cmds/statsd/tests/shell/ShellSubscriber_test.cpp
View File

@@ -20,9 +20,9 @@
#include <vector>
#include "frameworks/base/cmds/statsd/src/atoms.pb.h"
#include "frameworks/base/cmds/statsd/src/shell/shell_config.pb.h"
#include "frameworks/base/cmds/statsd/src/shell/shell_data.pb.h"
#include "frameworks/proto_logging/stats/atoms.pb.h"
#include "stats_event.h"
#include "tests/metrics/metrics_test_helper.h"
#include "tests/statsd_test_util.h"

2
tools/stats_log_api_gen/Collation.cpp
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 {

2
tools/stats_log_api_gen/Collation.h
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 {

2
tools/stats_log_api_gen/main.cpp
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"

4
tools/stats_log_api_gen/test.proto
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;