Merge "Flag lib linking: remove whole static" into main (0140fae3) · Commits · e / os / android_packages_modules_Bluetooth

android/app/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,7 @@ cc_library_shared {
		"android.system.suspend-V1-ndk",
		"android.system.suspend.control-V1-ndk",
		"avrcp-target-service",
		"bluetooth_flags_c_lib",
		"lib-bt-packets-avrcp",
		"lib-bt-packets-base",
		"libFraunhoferAAC",

+1 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ cc_aconfig_library {
		aconfig_declarations: "bluetooth_aconfig_flags",
		host_supported: true,
		visibility: [
		"//packages/modules/Bluetooth/system:__subpackages__",
		"//packages/modules/Bluetooth:__subpackages__",
		],
		apex_available: [
		"com.android.btservices",

+2 −1

Original line number	Diff line number	Diff line
		@@ -298,10 +298,10 @@ cc_test {
		"libbase",
		"libbinder",
		"libbinder_ndk",
		"libcutils",
		"libfmq",
		"liblog",
		"libstatslog",
		"libcutils",
		"libutils",
		"server_configurable_flags",
		],
		@@ -349,6 +349,7 @@ cc_test {
		"le_audio_software_unittest.cc",
		],
		static_libs: [
		"bluetooth_flags_c_lib",
		"libbt-bta",
		"libbt-platform-protos-lite",
		"libcutils",

+1 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ cc_defaults {
		"android.hardware.common.fmq-V1-ndk",
		"android.system.suspend-V1-ndk",
		"android.system.suspend.control-V1-ndk",
		"bluetooth_flags_c_lib",
		"libFraunhoferAAC",
		"libbase",
		"libbluetooth-dumpsys",

+2 −3

Original line number	Diff line number	Diff line
		@@ -230,6 +230,7 @@ cc_library_static {
		},
		},
		static_libs: [
		"bluetooth_flags_c_lib",
		"lib-bt-packets",
		"lib-bt-packets-base",
		"libbluetooth_crypto_toolbox",
		@@ -244,9 +245,6 @@ cc_library_static {
		"libflatbuffers-cpp",
		"libstatslog_bt",
		],
		whole_static_libs: [
		"bluetooth_flags_c_lib",
		],
		shared_libs: [
		"libcrypto",
		],
		@@ -296,6 +294,7 @@ cc_test {
		"android.hardware.audio.common@5.0",
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"bluetooth_flags_c_lib",
		"libFraunhoferAAC",
		"libbase",
		"libbluetooth-dumpsys",