zenfone7: Build bluetooth audio from source
Change-Id: Ia30b9303de0b82e96966c555cc4985d82f9ee7bc
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index dd4049a..ddbf8c2 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -807,8 +807,6 @@
vendor/etc/perf/targetresourceconfigs.xml
vendor/etc/permissions/android.hardware.audio.low_latency.xml
vendor/etc/permissions/android.hardware.audio.pro.xml
-vendor/etc/permissions/android.hardware.bluetooth.xml
-vendor/etc/permissions/android.hardware.bluetooth_le.xml
vendor/etc/permissions/android.hardware.camera.flash-autofocus.xml
vendor/etc/permissions/android.hardware.camera.front.xml
vendor/etc/permissions/android.hardware.camera.full.xml
@@ -1383,7 +1381,6 @@
vendor/lib/ese_spi_nxp.so
vendor/lib/ftm_fm_lib.so
vendor/lib/hal_libnfc.so
-vendor/lib/hw/android.hardware.bluetooth.audio@2.0-impl.so
vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so
vendor/lib/hw/android.hardware.boot@1.0-impl-1.1-qti.so
vendor/lib/hw/android.hardware.camera.provider@2.4-impl.so
@@ -1391,7 +1388,6 @@
vendor/lib/hw/android.hardware.gnss@2.1-impl-qti.so
vendor/lib/hw/android.hardware.soundtrigger@2.1-impl.so
vendor/lib/hw/android.hardware.soundtrigger@2.2-impl.so
-vendor/lib/hw/audio.bluetooth.default.so
vendor/lib/hw/audio.bluetooth_qti.default.so
vendor/lib/hw/audio.primary.kona.so
vendor/lib/hw/audio.r_submix.default.so
@@ -1519,7 +1515,6 @@
vendor/lib/libbatching.so
vendor/lib/libbatterylistener.so
vendor/lib/libbitmlengine.so
-vendor/lib/libbluetooth_audio_session.so
vendor/lib/libbluetooth_audio_session_qti.so
vendor/lib/libboot_control_qti.so
vendor/lib/libbt-hidlclient.so
@@ -2123,14 +2118,12 @@
vendor/lib64/ese_spi_nxp.so
vendor/lib64/ftm_fm_lib.so
vendor/lib64/hal_libnfc.so
-vendor/lib64/hw/android.hardware.bluetooth.audio@2.0-impl.so
vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
vendor/lib64/hw/android.hardware.boot@1.0-impl-1.1-qti.so
vendor/lib64/hw/android.hardware.camera.provider@2.4-impl.so
vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so
vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so
vendor/lib64/hw/android.hardware.soundtrigger@2.2-impl.so
-vendor/lib64/hw/audio.bluetooth.default.so
vendor/lib64/hw/audio.bluetooth_qti.default.so
vendor/lib64/hw/audio.primary.kona.so
vendor/lib64/hw/audio.r_submix.default.so
@@ -2264,7 +2257,6 @@
vendor/lib64/libbatching.so
vendor/lib64/libbatterylistener.so
vendor/lib64/libbitmlengine.so
-vendor/lib64/libbluetooth_audio_session.so
vendor/lib64/libbluetooth_audio_session_qti.so
vendor/lib64/libboot_control_qti.so
vendor/lib64/libbt-hidlclient.so
diff --git a/regen-vendor.sh b/regen-vendor.sh
index 8b7f25f..3eb7d75 100755
--- a/regen-vendor.sh
+++ b/regen-vendor.sh
@@ -66,6 +66,8 @@
"etc/audio_policy_volumes.xml"
"etc/audio_policy_volumes_ZS670KS.xml"
"etc/audio_tuning_mixer.txt"
+ "etc/permissions/android.hardware.bluetooth.xml"
+ "etc/permissions/android.hardware.bluetooth_le.xml"
"etc/bluetooth_qti_audio_policy_configuration.xml"
"bin/hw/android.hardware.audio.service"
"etc/init/android.hardware.audio.service.rc"
@@ -74,6 +76,7 @@
"lib/android.hardware.audio.common@4.0-util.so"
"lib/android.hardware.audio.common@5.0-util.so"
"lib/android.hardware.audio.common@6.0-util.so"
+ "lib/libbluetooth_audio_session.so"
"lib/hw/android.hardware.audio.effect@2.0-impl.so"
"lib/hw/android.hardware.audio.effect@4.0-impl.so"
"lib/hw/android.hardware.audio.effect@5.0-impl.so"
@@ -82,11 +85,13 @@
"lib/hw/android.hardware.audio@4.0-impl.so"
"lib/hw/android.hardware.audio@5.0-impl.so"
"lib/hw/android.hardware.audio@6.0-impl.so"
+ "lib/hw/android.hardware.bluetooth.audio@2.0-impl.so"
"lib64/android.hardware.audio.common-util.so"
"lib64/android.hardware.audio.common@2.0-util.so"
"lib64/android.hardware.audio.common@4.0-util.so"
"lib64/android.hardware.audio.common@5.0-util.so"
"lib64/android.hardware.audio.common@6.0-util.so"
+ "lib64/libbluetooth_audio_session.so"
"lib64/hw/android.hardware.audio.effect@2.0-impl.so"
"lib64/hw/android.hardware.audio.effect@4.0-impl.so"
"lib64/hw/android.hardware.audio.effect@5.0-impl.so"
@@ -95,6 +100,9 @@
"lib64/hw/android.hardware.audio@4.0-impl.so"
"lib64/hw/android.hardware.audio@5.0-impl.so"
"lib64/hw/android.hardware.audio@6.0-impl.so"
+ "lib64/hw/android.hardware.bluetooth.audio@2.0-impl.so"
+ "lib/hw/audio.bluetooth.default.so"
+ "lib64/hw/audio.bluetooth.default.so"
"lib/hw/audio.primary.default.so"
"lib64/hw/audio.primary.default.so"
"lib/libeffects.so"