Merge "Revert^2 "Delete atoms.proto from statsd"" (e72a1eb1) · Commits · e / os / android_frameworks_base

Android.bp

+5 −1

Original line number	Diff line number	Diff line
		@@ -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: {

cmds/statsd/Android.bp

+15 −36

Original line number	Diff line number	Diff line
		@@ -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",

cmds/statsd/src/shell/shell_data.proto

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 {

cmds/statsd/src/stats_log.proto

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

cmds/statsd/tests/LogEvent_test.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"