Merge "Format build files with bpfmt" (47f72049) · Commits · e / os / android_packages_modules_Bluetooth

android/app/Android.bp

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -136,7 +136,10 @@ android_app {
	"src/*/.java",		"src/*/.java",
	":statslog-bluetooth-java-gen",		":statslog-bluetooth-java-gen",
	],		],
	aaptflags: [ "--custom-package", "com.android.bluetooth" ],		aaptflags: [
			"--custom-package",
			"com.android.bluetooth",
			],
	certificate: ":com.android.bluetooth.certificate",		certificate: ":com.android.bluetooth.certificate",

	jarjar_rules: ":bluetooth-jarjar-rules",		jarjar_rules: ":bluetooth-jarjar-rules",
	@@ -217,7 +220,7 @@ android_app {
	java_library {		java_library {
	name: "bluetooth.change-ids",		name: "bluetooth.change-ids",
	srcs: [		srcs: [
	"src/com/android/bluetooth/ChangeIds.java"		"src/com/android/bluetooth/ChangeIds.java",
	],		],
	libs: [		libs: [
	"app-compat-annotations",		"app-compat-annotations",
	@@ -261,5 +264,5 @@ genrule {

	android_app_certificate {		android_app_certificate {
	name: "com.android.bluetooth.certificate",		name: "com.android.bluetooth.certificate",
	certificate: "certs/com.android.bluetooth"		certificate: "certs/com.android.bluetooth",
	}		}

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -59,7 +59,7 @@ android_test {
	test_config: "configs/PtsBotTest.xml",		test_config: "configs/PtsBotTest.xml",
	data: [		data: [
	"configs/pts_bot_tests_config.json",		"configs/pts_bot_tests_config.json",
	":mmi2grpc"		":mmi2grpc",
	],		],
	test_suites: ["device-tests"],		test_suites: ["device-tests"],
	min_sdk_version: "Tiramisu",		min_sdk_version: "Tiramisu",
	@@ -71,7 +71,7 @@ android_test {
	test_config: "configs/PtsBotTestMts.xml",		test_config: "configs/PtsBotTestMts.xml",
	data: [		data: [
	"configs/pts_bot_tests_config.json",		"configs/pts_bot_tests_config.json",
	":mmi2grpc"		":mmi2grpc",
	],		],
	test_suites: ["mts-bluetooth"],		test_suites: ["mts-bluetooth"],
	min_sdk_version: "Tiramisu",		min_sdk_version: "Tiramisu",

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,10 @@ python_test_host {
	"libavatar",		"libavatar",
	"bumble_services_experimental-python",		"bumble_services_experimental-python",
	],		],
	required: ["PandoraServer", "aapt"],		required: [
			"PandoraServer",
			"aapt",
			],
	test_suites: ["general-tests"],		test_suites: ["general-tests"],
	test_options: {		test_options: {
	unit_test: false,		unit_test: false,
	@@ -45,5 +48,5 @@ sh_binary_host {
	"pandora_experimental-python-gen-src",		"pandora_experimental-python-gen-src",
	"tradefed",		"tradefed",
	"tradefed-test-framework",		"tradefed-test-framework",
	]		],
	}		}

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,7 @@ java_sdk_library {
	jarjar_rules: ":bluetooth-jarjar-rules",		jarjar_rules: ":bluetooth-jarjar-rules",
	installable: true,		installable: true,
	optimize: {		optimize: {
	enabled: false		enabled: false,
	},		},
	hostdex: true, // for hiddenapi check		hostdex: true, // for hiddenapi check

	@@ -122,8 +122,7 @@ java_api_contribution {
	],		],
	}		}

	platform_compat_config		platform_compat_config {
	{
	name: "framework-bluetooth-compat-config",		name: "framework-bluetooth-compat-config",
	src: ":framework-bluetooth",		src: ":framework-bluetooth",
	}		}

+14 −14

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@ genrule {
	name: "pandora_experimental-python-gen-src",		name: "pandora_experimental-python-gen-src",
	tools: [		tools: [
	"aprotoc",		"aprotoc",
	"protoc-gen-pandora-python"		"protoc-gen-pandora-python",
	],		],
	cmd: "$(location aprotoc)" +		cmd: "$(location aprotoc)" +
	" -Ipackages/modules/Bluetooth/pandora/interfaces" +		" -Ipackages/modules/Bluetooth/pandora/interfaces" +
	@@ -70,17 +70,17 @@ genrule {
	"pandora_experimental/rfcomm_grpc_aio.py",		"pandora_experimental/rfcomm_grpc_aio.py",
	"pandora_experimental/rfcomm_pb2.py",		"pandora_experimental/rfcomm_pb2.py",
	"pandora_experimental/rfcomm_pb2.pyi",		"pandora_experimental/rfcomm_pb2.pyi",
	]		],
	}		}

	filegroup {		filegroup {
	name: "pandora_experimental-python-src",		name: "pandora_experimental-python-src",
	srcs: [		srcs: [
	":pandora_experimental-python-gen-src"		":pandora_experimental-python-gen-src",
	],		],
	exclude_srcs: [		exclude_srcs: [
	":pandora_experimental-python-stubs",		":pandora_experimental-python-stubs",
	]		],
	}		}

	filegroup {		filegroup {
	@@ -107,5 +107,5 @@ python_library_host {
	libs: ["pandora-python"],		libs: ["pandora-python"],
	data: [		data: [
	":pandora_experimental-python-stubs",		":pandora_experimental-python-stubs",
	]		],
	}		}