Do not install android.hardware.bluetooth.audio-impl This is now an explicit dependency of android.hardware.audio.service-aidl.example (cc_binary). Do not install it separately on trunk_staging. Besides, since android.hardware.audio.service-aidl.example is now a part of com.android.hardware.audio apex, /vendor/lib32/android.hardware.bluetooth.audio-impl.so is not used by any processes. We can remove the following files from /vendor/lib: - android.hardware.audio.common-V3-ndk.so - android.hardware.audio.common@5.0.so - android.hardware.bluetooth.audio-V4-ndk.so - android.hardware.bluetooth.audio-impl.so - android.hardware.bluetooth.audio@2.0.so - android.hardware.bluetooth.audio@2.1.so - android.hidl.safe_union@1.0.so - android.media.audio.common.types-V3-ndk.so - libbluetooth_audio_session_aidl.so - libflatbuffers-cpp.so - libfmq.so - libxml2.so - server_configurable_flags.so Bug: 312265159 Test: atest VtsHalBluetoothAudioTargetTest Change-Id: I38a381deedc45c5768647c8c50699fde385707ca
diff --git a/shared/bluetooth/device_vendor.mk b/shared/bluetooth/device_vendor.mk index 451f300..2c5f2e9 100644 --- a/shared/bluetooth/device_vendor.mk +++ b/shared/bluetooth/device_vendor.mk
@@ -32,11 +32,13 @@ PRODUCT_PACKAGES += com.google.cf.bt +ifneq ($(RELEASE_AIDL_USE_UNFROZEN),true) # # Bluetooth Audio AIDL HAL # PRODUCT_PACKAGES += \ - android.hardware.bluetooth.audio-impl \ + android.hardware.bluetooth.audio-impl +endif else # BOARD_HAVE_BLUETOOTH == true