Merge "bt_headless: Remove shared lib dependencies" into main (1de13d04) · Commits · e / os / android_packages_modules_Bluetooth

system/test/headless/Android.bp

+21 −9

Original line number	Diff line number	Diff line
		@@ -29,7 +29,9 @@ cc_binary {
		host_supported: true,
		defaults: [
		"fluoride_defaults",
		"latest_android_hardware_bluetooth_audio_ndk_shared",
		"latest_android_hardware_audio_common_ndk_static",
		"latest_android_hardware_bluetooth_audio_ndk_static",
		"latest_android_media_audio_common_types_ndk_static",
		],
		cflags: [
		"-Wall",
		@@ -71,13 +73,17 @@ cc_binary {
		"packages/modules/Bluetooth/system/stack/include",
		],
		static_libs: [
		"android.hardware.audio.common@5.0",
		"android.hardware.bluetooth.a2dp@1.0",
		"android.hardware.common-V2-ndk",
		"android.hardware.common.fmq-V1-ndk",
		"avrcp-target-service",
		"lib-bt-packets",
		"lib-bt-packets-avrcp",
		"lib-bt-packets-base",
		"libFraunhoferAAC",
		"libaudio-a2dp-hw-utils",
		"libbase",
		"libbluetooth-dumpsys",
		"libbluetooth-gdx",
		"libbluetooth-types",
		@@ -110,6 +116,7 @@ cc_binary {
		"libcom.android.sysprop.bluetooth.wrapped",
		"libevent",
		"libflatbuffers-cpp",
		"libfmq",
		"libg722codec",
		"liblc3",
		"libmodpb64",
		@@ -121,16 +128,9 @@ cc_binary {
		"libz",
		],
		shared_libs: [
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"android.hardware.bluetooth@1.0",
		"android.hardware.bluetooth@1.1",
		"libPlatformProperties",
		"libbase",
		"libbinder_ndk",
		"libcrypto",
		"libcutils", // property_get_bool
		"libfmq",
		"libhidlbase",
		"libjsoncpp",
		"liblog", // __android_log_print
		@@ -141,14 +141,26 @@ cc_binary {
		target: {
		android: {
		static_libs: [
		"android.hardware.bluetooth.audio-V4-ndk",
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"android.hardware.bluetooth@1.0",
		"android.hardware.bluetooth@1.1",
		"android.system.suspend.control-V1-ndk",
		],
		shared_libs: [
		"android.hardware.bluetooth.audio-V4-ndk",
		"android.system.suspend-V1-ndk",
		"libaaudio",
		"libbinder_ndk",
		"libstatssocket",
		],
		},
		host: {
		static_libs: [
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"libbinder_ndk",
		],
		},
		},
		}

system/test/headless/pushme.sh

+0 −7

Original line number	Diff line number	Diff line
		@@ -10,10 +10,3 @@ adb wait-for-device

		## Push various shared libraries where the executable expects to find them
		adb push ${ANDROID_BUILD_TOP}/out/target/product/${PRODUCT}/symbols/system/bin/bt_headless /system/bin/bt_headless
		adb push ${ANDROID_BUILD_TOP}/out/target/product/${PRODUCT}/symbols/system/lib64/android.hardware.bluetooth.audio@2.0.so /system/lib64/android.hardware.bluetooth.audio@2.0.so
		adb push ${ANDROID_BUILD_TOP}/out/target/product/${PRODUCT}/symbols/system/lib64/android.hardware.bluetooth.audio@2.1.so /system/lib64/android.hardware.bluetooth.audio@2.1.so
		adb push ${ANDROID_BUILD_TOP}/out/target/product/${PRODUCT}/symbols/system/lib64/android.hardware.bluetooth@1.0.so /system/lib64/android.hardware.bluetooth@1.0.so
		adb push ${ANDROID_BUILD_TOP}/out/target/product/${PRODUCT}/symbols/system/lib64/android.hardware.bluetooth@1.1.so /system/lib64/android.hardware.bluetooth@1.1.so
		adb push ${ANDROID_BUILD_TOP}/out/target/product/${PRODUCT}/symbols/system/lib64/android.hardware.bluetooth.audio-V4-ndk.so /system/lib64/android.hardware.bluetooth.audio-V4-ndk.so
		adb push ${ANDROID_BUILD_TOP}/out/target/product/${PRODUCT}/symbols/system/lib64/android.hardware.audio.common-V3-ndk.so /system/lib64/android.hardware.audio.common-V3-ndk.so
		adb push ${ANDROID_BUILD_TOP}/out/target/product/${PRODUCT}/symbols/system/lib64/android.media.audio.common.types-V3-ndk.so /system/lib64/android.media.audio.common.types-V3-ndk.so