Merge "net_test_btif: Remove shared audio libs deps" into main (9a43e9cc) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/Android.bp

+15 −11

Original line number	Diff line number	Diff line
		@@ -164,9 +164,6 @@ cc_library_static {
		"libbtif-core",
		"libflatbuffers-cpp",
		],
		shared_libs: [
		"android.hardware.bluetooth.audio@2.1",
		],
		cflags: [
		"-DBUILDCFG",
		"-Wno-unused-parameter",
		@@ -288,16 +285,17 @@ cc_test {
		],
		header_libs: ["libbluetooth_headers"],
		shared_libs: [
		"libbinder_ndk",
		"libcrypto",
		"libcutils",
		"libfmq",
		"libhidlbase",
		"liblog",
		"libutils",
		"server_configurable_flags",
		],
		static_libs: [
		"android.hardware.audio.common@5.0",
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"libFraunhoferAAC",
		"libbase",
		"libbluetooth-dumpsys",
		@@ -329,6 +327,7 @@ cc_test {
		"libevent",
		"libflagtest",
		"libflatbuffers-cpp",
		"libfmq",
		"libg722codec",
		"libgmock",
		"liblc3",
		@@ -341,8 +340,6 @@ cc_test {
		target: {
		android: {
		shared_libs: [
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"libPlatformProperties",
		"libbinder_ndk",
		"libstatssocket",
		@@ -358,6 +355,11 @@ cc_test {
		"libaaudio",
		],
		},
		host: {
		static_libs: [
		"libbinder_ndk",
		],
		},
		},
		cflags: ["-DBUILDCFG"],
		sanitize: {
		@@ -636,7 +638,10 @@ cc_test {
		"server_configurable_flags",
		],
		static_libs: [
		"android.hardware.audio.common@5.0",
		"android.hardware.bluetooth.a2dp@1.0",
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"avrcp-target-service",
		"bluetooth_flags_c_lib",
		"lib-bt-packets",
		@@ -680,8 +685,6 @@ cc_test {
		"android.hardware.common.fmq-V1-ndk",
		],
		shared_libs: [
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"libaaudio",
		"libbinder_ndk",
		"libstatssocket",
		@@ -762,6 +765,9 @@ cc_test {
		"server_configurable_flags",
		],
		static_libs: [
		"android.hardware.audio.common@5.0",
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"avrcp-target-service",
		"bluetooth_flags_c_lib",
		"lib-bt-packets",
		@@ -803,8 +809,6 @@ cc_test {
		"android.hardware.common.fmq-V1-ndk",
		],
		shared_libs: [
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"libbinder_ndk",
		"libstatssocket",
		],