Merge "Move keystore.proto into android/app" into main (da0f394b) · Commits · e / os / android_packages_modules_Bluetooth

android/app/Android.bp

+4 −0

Original line number	Diff line number	Diff line
		@@ -199,8 +199,12 @@ android_app {
		srcs: [
		":statslog-bluetooth-java-gen",
		":statslog-bt-restricted-java-gen",
		"proto/keystore.proto",
		"src/*/.java",
		],
		proto: {
		type: "lite",
		},
		aaptflags: [
		"--custom-package",
		"com.android.bluetooth",

+0 −3

Original line number	Diff line number	Diff line
		@@ -16,9 +16,6 @@

		syntax = "proto2";

		// C++ namespace: bluetooth::metrics::BluetoothMetricsProto
		package bluetooth.keystore.BluetoothKeystoreProto;

		option java_package = "com.android.bluetooth";
		option java_outer_classname = "BluetoothKeystoreProto";

+0 −3

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@ java_library_static {
		type: "lite",
		},
		srcs: [
		"bluetooth/bluetoothKeystore/keystore.proto",
		"bluetooth/metrics/bluetooth.proto",
		],
		apex_available: [
		@@ -32,7 +31,6 @@ cc_library_static {
		type: "lite",
		},
		srcs: [
		"bluetooth/bluetoothKeystore/keystore.proto",
		"bluetooth/metrics/bluetooth.proto",
		],
		apex_available: [
		@@ -50,7 +48,6 @@ cc_library_static {
		include_dirs: ["external/protobuf/src"],
		},
		srcs: [
		"bluetooth/bluetoothKeystore/keystore.proto",
		"bluetooth/metrics/bluetooth.proto",
		],
		apex_available: [