diff options
| -rw-r--r-- | BoardConfigCommon.mk | 3 | ||||
| -rw-r--r-- | audio/audio_platform_info.xml | 49 | ||||
| -rw-r--r-- | proprietary-files.txt | 1 | ||||
| -rw-r--r-- | shinano.mk | 9 |
4 files changed, 1 insertions, 61 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index e4616b9..3394082 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -31,9 +31,6 @@ TARGET_DTB_EXTRA_FLAGS := --force-v2 # ANT+ BOARD_ANT_WIRELESS_DEVICE := "vfs-prerelease" -# Audio -#BOARD_AUDIO_AMPLIFIER := device/sony/shinano-common/libaudioamp - # Bluetooth BOARD_HAVE_BLUETOOTH := true BOARD_HAVE_BLUETOOTH_BCM := true diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml deleted file mode 100644 index 821e385..0000000 --- a/audio/audio_platform_info.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved. --> -<!-- --> -<!-- Redistribution and use in source and binary forms, with or without --> -<!-- modification, are permitted provided that the following conditions are --> -<!-- met: --> -<!-- * Redistributions of source code must retain the above copyright --> -<!-- notice, this list of conditions and the following disclaimer. --> -<!-- * Redistributions in binary form must reproduce the above --> -<!-- copyright notice, this list of conditions and the following --> -<!-- disclaimer in the documentation and/or other materials provided --> -<!-- with the distribution. --> -<!-- * Neither the name of The Linux Foundation nor the names of its --> -<!-- contributors may be used to endorse or promote products derived --> -<!-- from this software without specific prior written permission. --> -<!-- --> -<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED --> -<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF --> -<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT --> -<!-- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS --> -<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR --> -<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF --> -<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR --> -<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, --> -<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN --> -<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> -<audio_platform_info> - <acdb_ids> - <!-- empty --> - </acdb_ids> - - <backend_names> - <device name="SND_DEVICE_OUT_SPEAKER" backend="speaker" /> - <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" backend="speaker-reverse" /> - <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" /> - <device name="SND_DEVICE_OUT_VOICE_SPEAKER" backend="voice-speaker" /> - <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-anc-headphones" /> - <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" backend="speaker-protected" /> - <device name="SND_DEVICE_OUT_VOIP_SPEAKER" backend="voip-speaker-comm" /> - </backend_names> - - <pcm_ids> - <!-- empty --> - </pcm_ids> - - <device_names> - <!-- empty --> - </device_names> -</audio_platform_info> diff --git a/proprietary-files.txt b/proprietary-files.txt index ed9befa..4dcd55b 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,4 +1,5 @@ # Audio +lib/hw/audio.primary.msm8974.so vendor/lib/libacdbloader.so vendor/lib/libacdbrtac.so vendor/lib/libadiertac.so @@ -58,15 +58,6 @@ PRODUCT_PACKAGES += \ com.dsi.ant.antradio_library \ libantradio -# Audio -PRODUCT_PACKAGES += \ - tfa9890_amp -# libaudioamp - -# Audio configuration -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/audio_platform_info.xml:system/etc/audio_platform_info.xml - # Bluetooth PRODUCT_COPY_FILES += \ $(COMMON_PATH)/bluetooth/bt_vendor.conf:system/etc/bluetooth/bt_vendor.conf |