Update V4A, it now pre-installs drivers by default
DEVICE MAINTAINERS : You need to remove deep_buffer
from audio_config.conf
Change-Id: I38635fbd2321fe60da0dae8e6857cc5b58eb46a3
diff --git a/config/bliss_audio_mod.mk b/config/bliss_audio_mod.mk
index a86095a..3579f38 100644
--- a/config/bliss_audio_mod.mk
+++ b/config/bliss_audio_mod.mk
@@ -13,20 +13,11 @@
# limitations under the License.
# V4A files
-ifeq (viper, $(BLISS_AUDIO_MOD))
+ifeq (viper, $(strip $(BLISS_AUDIO_MOD)))
PRODUCT_COPY_FILES += \
vendor/bliss/prebuilt/V4A/etc/audio_effects.conf:system/etc/audio_effects.conf \
- vendor/bliss/prebuilt/V4A/etc/audio_policy.conf:system/etc/audio_policy.conf \
- vendor/bliss/prebuilt/V4A/lib/soundfx/libaudiopreprocessing.so:system/lib/soundfx/libaudiopreprocessing.so \
- vendor/bliss/prebuilt/V4A/lib/soundfx/libbundlewrapper.so:system/lib/soundfx/libbundlewrapper.so \
- vendor/bliss/prebuilt/V4A/lib/soundfx/libdownmix.so:system/lib/soundfx/libdownmix.so \
vendor/bliss/prebuilt/V4A/lib/soundfx/libeffectproxy.so:system/lib/soundfx/libeffectproxy.so \
- vendor/bliss/prebuilt/V4A/lib/soundfx/libfmas.so:system/lib/soundfx/libfmas.so \
- vendor/bliss/prebuilt/V4A/lib/soundfx/libldnhncr.so:system/lib/soundfx/libldnhncr.so \
- vendor/bliss/prebuilt/V4A/lib/soundfx/libqcomvoiceprocessing.so:system/lib/soundfx/libqcomvoiceprocessing.so \
- vendor/bliss/prebuilt/V4A/lib/soundfx/libreverbwrapper.so:system/lib/soundfx/libreverbwrapper.so \
vendor/bliss/prebuilt/V4A/lib/soundfx/libv4a_fx_ics.so:system/lib/soundfx/libv4a_fx_ics.so \
- vendor/bliss/prebuilt/V4A/lib/soundfx/libvisualizer.so:system/lib/soundfx/libvisualizer.so \
vendor/bliss/prebuilt/V4A/priv-app/ViPER4Android/ViPER4Android.apk:system/priv-app/ViPER4Android/ViPER4Android.apk \
vendor/bliss/prebuilt/V4A/vendor/etc/audio_effects.conf:system/vendor/etc/audio_effects.conf
else
@@ -34,4 +25,3 @@
PRODUCT_PACKAGES += \
AudioFX
endif
-
diff --git a/prebuilt/V4A/etc/audio_policy.conf b/prebuilt/V4A/etc/audio_policy.conf
deleted file mode 100644
index 7f4ef3a..0000000
--- a/prebuilt/V4A/etc/audio_policy.conf
+++ /dev/null
@@ -1,75 +0,0 @@
-# Global configuration section: lists input and output devices always present on the device
-# as well as the output device selected by default.
-# Devices are designated by a string that corresponds to the enum in audio.h
-
-global_configuration {
- attached_output_devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER
- default_output_device AUDIO_DEVICE_OUT_SPEAKER
- attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC
-}
-
-# audio hardware module section: contains descriptors for all audio hw modules present on the
-# device. Each hw module node is named after the corresponding hw module library base name.
-# For instance, "primary" corresponds to audio.primary.<device>.so.
-# The "primary" module is mandatory and must include at least one output with
-# AUDIO_OUTPUT_FLAG_PRIMARY flag.
-# Each module descriptor contains one or more output profile descriptors and zero or more
-# input profile descriptors. Each profile lists all the parameters supported by a given output
-# or input stream category.
-# The "channel_masks", "formats", "devices" and "flags" are specified using strings corresponding
-# to enums in audio.h and audio_policy.h. They are concatenated by use of "|" without space or "\n".
-
-audio_hw_modules {
- primary {
- outputs {
- primary {
- sampling_rates 44100
- channel_masks AUDIO_CHANNEL_OUT_STEREO
- formats AUDIO_FORMAT_PCM_16_BIT
- devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET
- flags AUDIO_OUTPUT_FLAG_PRIMARY
- }
- hdmi {
- sampling_rates 44100|48000
- channel_masks dynamic
- formats AUDIO_FORMAT_PCM_16_BIT
- devices AUDIO_DEVICE_OUT_AUX_DIGITAL
- flags AUDIO_OUTPUT_FLAG_DIRECT
- }
- }
- inputs {
- primary {
- sampling_rates 8000|11025|16000|22050|24000|32000|44100|48000
- channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK
- formats AUDIO_FORMAT_PCM_16_BIT
- devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BACK_MIC
- }
- }
- }
- a2dp {
- outputs {
- a2dp {
- sampling_rates 44100
- channel_masks AUDIO_CHANNEL_OUT_STEREO
- formats AUDIO_FORMAT_PCM_16_BIT
- devices AUDIO_DEVICE_OUT_ALL_A2DP
- }
- }
- }
- usb {
- outputs {
- usb_accessory {
- sampling_rates 44100
- channel_masks AUDIO_CHANNEL_OUT_STEREO
- formats AUDIO_FORMAT_PCM_16_BIT
- devices AUDIO_DEVICE_OUT_USB_ACCESSORY
- }
- usb_device {
- sampling_rates 44100
- channel_masks AUDIO_CHANNEL_OUT_STEREO
- formats AUDIO_FORMAT_PCM_16_BIT
- devices AUDIO_DEVICE_OUT_USB_DEVICE
- }
- }
- }
-}
diff --git a/prebuilt/V4A/lib/soundfx/libaudiopreprocessing.so b/prebuilt/V4A/lib/soundfx/libaudiopreprocessing.so
deleted file mode 100644
index 31ea881..0000000
--- a/prebuilt/V4A/lib/soundfx/libaudiopreprocessing.so
+++ /dev/null
Binary files differ
diff --git a/prebuilt/V4A/lib/soundfx/libbundlewrapper.so b/prebuilt/V4A/lib/soundfx/libbundlewrapper.so
deleted file mode 100644
index 1559009..0000000
--- a/prebuilt/V4A/lib/soundfx/libbundlewrapper.so
+++ /dev/null
Binary files differ
diff --git a/prebuilt/V4A/lib/soundfx/libdownmix.so b/prebuilt/V4A/lib/soundfx/libdownmix.so
deleted file mode 100644
index d481dd7..0000000
--- a/prebuilt/V4A/lib/soundfx/libdownmix.so
+++ /dev/null
Binary files differ
diff --git a/prebuilt/V4A/lib/soundfx/libfmas.so b/prebuilt/V4A/lib/soundfx/libfmas.so
deleted file mode 100644
index d19e752..0000000
--- a/prebuilt/V4A/lib/soundfx/libfmas.so
+++ /dev/null
Binary files differ
diff --git a/prebuilt/V4A/lib/soundfx/libldnhncr.so b/prebuilt/V4A/lib/soundfx/libldnhncr.so
deleted file mode 100644
index 7557d65..0000000
--- a/prebuilt/V4A/lib/soundfx/libldnhncr.so
+++ /dev/null
Binary files differ
diff --git a/prebuilt/V4A/lib/soundfx/libqcomvoiceprocessing.so b/prebuilt/V4A/lib/soundfx/libqcomvoiceprocessing.so
deleted file mode 100644
index dd79843..0000000
--- a/prebuilt/V4A/lib/soundfx/libqcomvoiceprocessing.so
+++ /dev/null
Binary files differ
diff --git a/prebuilt/V4A/lib/soundfx/libreverbwrapper.so b/prebuilt/V4A/lib/soundfx/libreverbwrapper.so
deleted file mode 100644
index e8b897f..0000000
--- a/prebuilt/V4A/lib/soundfx/libreverbwrapper.so
+++ /dev/null
Binary files differ
diff --git a/prebuilt/V4A/lib/soundfx/libv4a_fx_ics.so b/prebuilt/V4A/lib/soundfx/libv4a_fx_ics.so
index a5968e1..9b44e7f 100644
--- a/prebuilt/V4A/lib/soundfx/libv4a_fx_ics.so
+++ b/prebuilt/V4A/lib/soundfx/libv4a_fx_ics.so
Binary files differ
diff --git a/prebuilt/V4A/lib/soundfx/libvisualizer.so b/prebuilt/V4A/lib/soundfx/libvisualizer.so
deleted file mode 100755
index 7859e31..0000000
--- a/prebuilt/V4A/lib/soundfx/libvisualizer.so
+++ /dev/null
Binary files differ