Merge "Move/rename stats_enums.proto's directory/name" (d2aa51e4) · Commits · e / os / android_frameworks_base

Android.bp

+0 −3

Original line number	Diff line number	Diff line
		@@ -833,7 +833,6 @@ java_library_host {
		"cmds/statsd/src/*/.proto",
		"core/proto/*/.proto",
		"libs/incident/proto/*/.proto",
		"proto/src/stats_enums.proto",
		],
		proto: {
		include_dirs: ["external/protobuf/src"],
		@@ -871,7 +870,6 @@ java_library {
		srcs: [
		"core/proto/*/.proto",
		"libs/incident/proto/android/os/*/.proto",
		"proto/src/stats_enums.proto",
		],
		// Protos have lots of MissingOverride and similar.
		errorprone: {
		@@ -897,7 +895,6 @@ cc_library {
		srcs: [
		"core/proto/*/.proto",
		"libs/incident/*/.proto",
		"proto/src/stats_enums.proto",
		],

		target: {

+3 −3

Original line number	Diff line number	Diff line
		@@ -29,8 +29,8 @@ import "frameworks/base/core/proto/android/server/enums.proto";
		import "frameworks/base/core/proto/android/telecomm/enums.proto";
		import "frameworks/base/core/proto/android/telephony/enums.proto";
		import "frameworks/base/core/proto/android/view/enums.proto";
		import "frameworks/base/proto/src/stats_enums.proto";
		import "frameworks/base/core/proto/android/service/procstats.proto";
		import "frameworks/base/core/proto/android/stats/enums.proto";
		import "frameworks/base/core/proto/android/internal/powerprofile.proto";

		/**
		@@ -1952,7 +1952,7 @@ message GenericAtom {
		optional int32 uid = 1 [(is_uid) = true];

		// An event_id indicates the type of event.
		optional android.os.statsd.EventType event_id = 2;
		optional android.stats.EventType event_id = 2;
		}

		/**

+1 −2

Original line number	Diff line number	Diff line
		@@ -16,8 +16,7 @@

		syntax = "proto2";

		package android.os.statsd;
		option java_package = "com.android.os";
		package android.stats;
		option java_outer_classname = "StatsEnums";

		enum EventType {