Merge "[BP CLEANUP] Format bpfmt -s conflict 2/2" into udc-dev (5401c0c5) · Commits · e / os / android_packages_modules_Bluetooth

android/app/Android.bp

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -164,28 +164,28 @@ android_app {
	static_libs: [		static_libs: [
	"android.hardware.radio-V1.0-java",		"android.hardware.radio-V1.0-java",
	"android.hardware.radio.sap-V1-java",		"android.hardware.radio.sap-V1-java",
			"androidx.annotation_annotation",
	"androidx.core_core",		"androidx.core_core",
	"androidx.media_media",
	"androidx.lifecycle_lifecycle-livedata",		"androidx.lifecycle_lifecycle-livedata",
			"androidx.media_media",
	"androidx.room_room-runtime",		"androidx.room_room-runtime",
	"androidx.annotation_annotation",		"BluetoothApiShims",
			"bluetooth-proto-enums-java-gen",
			"bluetooth-protos-lite",
	"bluetooth.change-ids",		"bluetooth.change-ids",
	"bluetooth.mapsapi",		"bluetooth.mapsapi",
	"bluetooth-protos-lite",
	"com.android.vcard",
	"com.android.obex",		"com.android.obex",
			"com.android.vcard",
	"guava",		"guava",
	"libprotobuf-java-lite",		"libprotobuf-java-lite",
	"mmslib",		"mmslib",
	"modules-utils-backgroundthread",		"modules-utils-backgroundthread",
	"modules-utils-bytesmatcher",		"modules-utils-bytesmatcher",
	"modules-utils-synchronous-result-receiver",
	"modules-utils-statemachine",		"modules-utils-statemachine",
	"sap-api-java-static",		"modules-utils-synchronous-result-receiver",
	"net-utils-services-common",		"net-utils-services-common",
	"networkstack-client",		"networkstack-client",
	"bluetooth-proto-enums-java-gen",		"sap-api-java-static",
	"BluetoothApiShims",
	],		],

	plugins: [		plugins: [

system/audio_hal_interface/fuzzer/Android.bp

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -30,22 +30,22 @@ cc_defaults {
	"libbluetooth_headers",		"libbluetooth_headers",
	],		],
	shared_libs: [		shared_libs: [
	"libz",
	"libfmq",
	"libaaudio",
	"libcrypto",
	"libstatslog",
	"libbinder_ndk",
	"libstatssocket",
	"android.hardware.bluetooth.audio-V3-ndk",
	"android.hardware.bluetooth@1.0",
	"android.hardware.bluetooth@1.1",
	"android.hardware.bluetooth.a2dp@1.0",		"android.hardware.bluetooth.a2dp@1.0",
			"android.hardware.bluetooth.audio-V3-ndk",
	"android.hardware.bluetooth.audio@2.0",		"android.hardware.bluetooth.audio@2.0",
	"android.hardware.bluetooth.audio@2.1",		"android.hardware.bluetooth.audio@2.1",
	"android.system.suspend.control-V1-ndk",		"android.hardware.bluetooth@1.0",
			"android.hardware.bluetooth@1.1",
	"android.system.suspend-V1-ndk",		"android.system.suspend-V1-ndk",
			"android.system.suspend.control-V1-ndk",
	"libPlatformProperties",		"libPlatformProperties",
			"libaaudio",
			"libbinder_ndk",
			"libcrypto",
			"libfmq",
			"libstatslog",
			"libstatssocket",
			"libz",
	],		],
	static_libs: [		static_libs: [
	"libFraunhoferAAC",		"libFraunhoferAAC",

system/btif/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -294,9 +294,9 @@ cc_test {
	target: {		target: {
	android: {		android: {
	shared_libs: [		shared_libs: [
	"libbinder_ndk",
	"android.hardware.bluetooth.audio-V3-ndk",		"android.hardware.bluetooth.audio-V3-ndk",
	"libPlatformProperties",		"libPlatformProperties",
			"libbinder_ndk",
	],		],
	},		},
	},		},

system/stack/Android.bp

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -311,23 +311,23 @@ cc_test {
	"test/gatt/gatt_api_test.cc",		"test/gatt/gatt_api_test.cc",
	],		],
	shared_libs: [		shared_libs: [
	"android.hardware.bluetooth@1.0",		"android.hardware.bluetooth.audio-V3-ndk",
	"android.hardware.bluetooth@1.1",
	"android.hardware.bluetooth.audio@2.0",		"android.hardware.bluetooth.audio@2.0",
	"android.hardware.bluetooth.audio@2.1",		"android.hardware.bluetooth.audio@2.1",
	"android.hardware.bluetooth.audio-V3-ndk",		"android.hardware.bluetooth@1.0",
			"android.hardware.bluetooth@1.1",
			"libPlatformProperties",
	"libaaudio",		"libaaudio",
	"libbinder_ndk",		"libbinder_ndk",
			"libcrypto",
	"libcutils",		"libcutils",
	"libdl",		"libdl",
	"libfmq",		"libfmq",
	"libhidlbase",		"libhidlbase",
	"liblog",		"liblog",
	"libutils",
	"libtinyxml2",		"libtinyxml2",
			"libutils",
	"libz",		"libz",
	"libcrypto",
	"libPlatformProperties",
	],		],
	static_libs: [		static_libs: [
	"android.hardware.bluetooth.a2dp@1.0",		"android.hardware.bluetooth.a2dp@1.0",
	@@ -760,6 +760,9 @@ cc_test {
	"test/a2dp/raw_data/*",		"test/a2dp/raw_data/*",
	],		],
	srcs: [		srcs: [
			":TestCommonMockFunctions",
			":TestMockBta",
			":TestMockStackA2dpApi",
	"a2dp/a2dp_aac.cc",		"a2dp/a2dp_aac.cc",
	"a2dp/a2dp_aac_decoder.cc",		"a2dp/a2dp_aac_decoder.cc",
	"a2dp/a2dp_aac_encoder.cc",		"a2dp/a2dp_aac_encoder.cc",
	@@ -770,28 +773,25 @@ cc_test {
	"a2dp/a2dp_sbc_up_sample.cc",		"a2dp/a2dp_sbc_up_sample.cc",
	"a2dp/a2dp_vendor.cc",		"a2dp/a2dp_vendor.cc",
	"a2dp/a2dp_vendor_aptx.cc",		"a2dp/a2dp_vendor_aptx.cc",
	"a2dp/a2dp_vendor_aptx_hd.cc",
	"a2dp/a2dp_vendor_aptx_encoder.cc",		"a2dp/a2dp_vendor_aptx_encoder.cc",
			"a2dp/a2dp_vendor_aptx_hd.cc",
	"a2dp/a2dp_vendor_aptx_hd_encoder.cc",		"a2dp/a2dp_vendor_aptx_hd_encoder.cc",
	"a2dp/a2dp_vendor_ldac.cc",		"a2dp/a2dp_vendor_ldac.cc",
	"a2dp/a2dp_vendor_ldac_decoder.cc",		"a2dp/a2dp_vendor_ldac_decoder.cc",
	"a2dp/a2dp_vendor_ldac_encoder.cc",		"a2dp/a2dp_vendor_ldac_encoder.cc",
	"a2dp/a2dp_vendor_opus.cc",		"a2dp/a2dp_vendor_opus.cc",
	"a2dp/a2dp_vendor_opus_encoder.cc",
	"a2dp/a2dp_vendor_opus_decoder.cc",		"a2dp/a2dp_vendor_opus_decoder.cc",
			"a2dp/a2dp_vendor_opus_encoder.cc",
	"test/a2dp/a2dp_aac_unittest.cc",		"test/a2dp/a2dp_aac_unittest.cc",
	"test/a2dp/a2dp_sbc_unittest.cc",
	"test/a2dp/a2dp_sbc_regression_tests.cc",
	"test/a2dp/a2dp_opus_unittest.cc",		"test/a2dp/a2dp_opus_unittest.cc",
			"test/a2dp/a2dp_sbc_regression_tests.cc",
			"test/a2dp/a2dp_sbc_unittest.cc",
	"test/a2dp/a2dp_vendor_ldac_unittest.cc",		"test/a2dp/a2dp_vendor_ldac_unittest.cc",
	"test/a2dp/a2dp_vendor_regression_tests.cc",		"test/a2dp/a2dp_vendor_regression_tests.cc",
	"test/a2dp/mock_bta_av_codec.cc",		"test/a2dp/mock_bta_av_codec.cc",
	"test/a2dp/test_util.cc",		"test/a2dp/test_util.cc",
	"test/a2dp/wav_reader.cc",		"test/a2dp/wav_reader.cc",
	"test/a2dp/wav_reader_unittest.cc",		"test/a2dp/wav_reader_unittest.cc",
	":TestCommonMockFunctions",
	":TestMockBta",
	":TestMockStackA2dpApi",
	],		],
	shared_libs: [		shared_libs: [
	"libcrypto",		"libcrypto",

system/stack/test/fuzzers/Android.bp

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -45,24 +45,24 @@ cc_defaults {
	"libbluetooth_gd",		"libbluetooth_gd",
	],		],
	shared_libs: [		shared_libs: [
	"libbinder",
	"libbase",
	"libcutils",
	"liblog",
	"android.hardware.bluetooth@1.0",
	"android.hardware.bluetooth@1.1",
	"android.hardware.bluetooth.a2dp@1.0",		"android.hardware.bluetooth.a2dp@1.0",
			"android.hardware.bluetooth.audio-V3-ndk",
	"android.hardware.bluetooth.audio@2.0",		"android.hardware.bluetooth.audio@2.0",
	"android.hardware.bluetooth.audio@2.1",		"android.hardware.bluetooth.audio@2.1",
	"android.hardware.bluetooth.audio-V3-ndk",		"android.hardware.bluetooth@1.0",
			"android.hardware.bluetooth@1.1",
	"android.system.suspend.control-V1-ndk",		"android.system.suspend.control-V1-ndk",
			"libPlatformProperties",
	"libaaudio",		"libaaudio",
			"libbase",
			"libbinder",
	"libbinder_ndk",		"libbinder_ndk",
			"libcrypto",
			"libcutils",
	"libfmq",		"libfmq",
	"libhidlbase",		"libhidlbase",
			"liblog",
	"libprotobuf-cpp-lite",		"libprotobuf-cpp-lite",
	"libutils",		"libutils",
	"libcrypto",
	"libPlatformProperties",
	],		],
	}		}