Merge "Remove divergences in soong files from AOSP main" into main (e02532f0) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/Android.bp

+3 −3

Original line number	Diff line number	Diff line
		@@ -128,6 +128,9 @@ cc_library_static {
		],
		target: {
		android: {
		whole_static_libs: [
		"libPlatformProperties",
		],
		srcs: ["src/btif_avrcp_audio_track.cc"],
		shared_libs: ["libaaudio"],
		},
		@@ -211,9 +214,6 @@ cc_library_static {
		],
		target: {
		android: {
		whole_static_libs: [
		"libPlatformProperties",
		],
		srcs: ["src/btif_avrcp_audio_track.cc"],
		shared_libs: ["libaaudio"],
		},

+1 −1

Original line number	Diff line number	Diff line
		@@ -116,6 +116,7 @@ cc_binary {
		"android.hardware.bluetooth@1.0",
		"android.hardware.bluetooth@1.1",
		"android.system.suspend-V1-ndk",
		"libPlatformProperties",
		"libaaudio",
		"libbase",
		"libbinder_ndk",
		@@ -127,7 +128,6 @@ cc_binary {
		"liblog", // __android_log_print
		"libstatssocket",
		"libutils",
		"libPlatformProperties",
		],
		header_libs: ["libbluetooth_headers"],
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ cc_defaults {
		"android.hardware.bluetooth.audio@2.0",
		"android.hardware.bluetooth.audio@2.1",
		"android.system.suspend-V1-ndk",
		"libPlatformProperties",
		"libbinder",
		"libbinder_ndk",
		"libcrypto",
		@@ -58,7 +59,6 @@ cc_defaults {
		"liblog",
		"libstatssocket",
		"libutils",
		"libPlatformProperties",
		],
		static_libs: [
		"android.hardware.bluetooth.a2dp@1.0",