Merge "Remove framework-connectivity-proto from platform" (75fa8929) · Commits · e / os / android_frameworks_base

ProtoLibraries.bp

+0 −6

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ gensrcs {
		"&& $(location soong_zip) -jar -o $(out) -C $(genDir)/$(in) -D $(genDir)/$(in)",

		srcs: [
		":framework-connectivity-protos",
		":ipconnectivity-proto-src",
		":libstats_atom_enum_protos",
		":libstats_atom_message_protos",
		@@ -68,7 +67,6 @@ gensrcs {
		" $(in)",

		srcs: [
		":framework-connectivity-protos",
		":ipconnectivity-proto-src",
		":libstats_atom_enum_protos",
		":libstats_atom_message_protos",
		@@ -84,7 +82,6 @@ gensrcs {
		java_library_host {
		name: "platformprotos",
		srcs: [
		":framework-connectivity-protos",
		":ipconnectivity-proto-src",
		":libstats_atom_enum_protos",
		":libstats_atom_message_protos",
		@@ -124,7 +121,6 @@ java_library {
		],
		sdk_version: "9",
		srcs: [
		":framework-connectivity-protos",
		":ipconnectivity-proto-src",
		":libstats_atom_enum_protos",
		":libstats_atom_message_protos",
		@@ -147,7 +143,6 @@ java_library {
		},

		srcs: [
		":framework-connectivity-protos",
		":ipconnectivity-proto-src",
		":libstats_atom_enum_protos",
		":libstats_atom_message_protos",
		@@ -185,7 +180,6 @@ cc_defaults {
		],

		srcs: [
		":framework-connectivity-protos",
		":ipconnectivity-proto-src",
		":libstats_atom_enum_protos",
		":libstats_atom_message_protos",

+1 −6

Original line number	Diff line number	Diff line
		@@ -61,7 +61,6 @@ import "frameworks/base/core/proto/android/util/textdump.proto";
		import "frameworks/base/core/proto/android/privacy.proto";
		import "frameworks/base/core/proto/android/section.proto";
		import "frameworks/base/proto/src/ipconnectivity.proto";
		import "packages/modules/Connectivity/framework/proto/netstats.proto";
		import "packages/modules/Permission/service/proto/role_service.proto";

		package android.os;
		@@ -247,11 +246,7 @@ message IncidentProto {
		(section).args = "fingerprint --proto --incident"
		];

		optional android.service.NetworkStatsServiceDumpProto netstats = 3001 [
		(section).type = SECTION_DUMPSYS,
		(section).args = "netstats --proto",
		(section).userdebug_and_eng_only = true
		];
		reserved 3001;

		optional android.providers.settings.SettingsServiceDumpProto settings = 3002 [
		(section).type = SECTION_DUMPSYS,