audio: separate audio into system and vendor
Also add missing makefile include Change-Id: I96b8b3426f4aae737f5389c9ccac142004a6324f
This commit is contained in:
Jake Weinstein
chrisl7
parent
a7813ed68f
commit
61d7ab2372
|
|
@ -106,6 +106,7 @@ endif
|
|||
|
||||
ifneq (,$(filter audio, $(TARGET_COMMON_QTI_COMPONENTS)))
|
||||
include $(QCOM_COMMON_PATH)/system/audio/qti-audio.mk
|
||||
include $(QCOM_COMMON_PATH)/vendor/audio/qti-audio.mk
|
||||
endif
|
||||
|
||||
ifneq (,$(filter display, $(TARGET_COMMON_QTI_COMPONENTS)))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright (C) 2021 Paranoid Android
|
||||
# Copyright (C) 2022 Paranoid Android
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -12,59 +12,13 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# Inherit from QSSI audio makefile.
|
||||
# Inherit from QSSI audio makefiles.
|
||||
include $(TOPDIR)vendor/qcom/opensource/commonsys/audio/configs/qssi/qssi.mk
|
||||
|
||||
ifeq ($(call is-board-platform-in-list,sm6150),true)
|
||||
-include $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe/msmsteppe.mk
|
||||
else
|
||||
-include $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/$(TARGET_BOARD_PLATFORM)/$(TARGET_BOARD_PLATFORM).mk
|
||||
endif
|
||||
|
||||
# Override proprietary definitions from SoC audio makefile.
|
||||
AUDIO_FEATURE_ENABLED_AHAL_EXT := false
|
||||
|
||||
# Override proprietary definitions from SoC audio HAL Makefiles.
|
||||
AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := false
|
||||
BOARD_SUPPORTS_OPENSOURCE_STHAL := false
|
||||
|
||||
# OMX Packages
|
||||
PRODUCT_PACKAGES += \
|
||||
libOmxAacEnc \
|
||||
libOmxAmrEnc \
|
||||
libOmxEvrcEnc \
|
||||
libOmxG711Enc \
|
||||
libOmxQcelp13Enc
|
||||
include $(TOPDIR)vendor/qcom/opensource/commonsys/audio/configs/qssi/audio_system_product.mk
|
||||
|
||||
# Audio Packages
|
||||
PRODUCT_PACKAGES += \
|
||||
audio.a2dp.default \
|
||||
audio.primary.$(TARGET_BOARD_PLATFORM) \
|
||||
audio.r_submix.default \
|
||||
audio.usb.default \
|
||||
liba2dpoffload \
|
||||
libaudiohal \
|
||||
libaudio-resampler \
|
||||
libaudioroute \
|
||||
libbatterylistener \
|
||||
libcirrusspkrprot \
|
||||
libcomprcapture \
|
||||
libexthwplugin \
|
||||
libhdmiedid \
|
||||
libhfp \
|
||||
libqcompostprocbundle \
|
||||
libqcomvisualizer \
|
||||
libqcomvoiceprocessing \
|
||||
libsndmonitor \
|
||||
libspkrprot \
|
||||
libssrec \
|
||||
libtinycompress \
|
||||
libvolumelistener \
|
||||
sound_trigger.primary.$(TARGET_BOARD_PLATFORM)
|
||||
|
||||
# Permissions
|
||||
PRODUCT_COPY_FILES += \
|
||||
frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml
|
||||
audio.a2dp.default
|
||||
|
||||
# Get non-open-source specific aspects.
|
||||
$(call inherit-product-if-exists, vendor/qcom/common/system/audio/audio-vendor.mk)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,61 @@
|
|||
# Copyright (C) 2022 Paranoid Android
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
ifeq ($(call is-board-platform-in-list,sm6150),true)
|
||||
-include $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmsteppe/msmsteppe.mk
|
||||
else
|
||||
-include $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/$(TARGET_BOARD_PLATFORM)/$(TARGET_BOARD_PLATFORM).mk
|
||||
endif
|
||||
|
||||
# Override proprietary definitions from SoC audio HAL Makefiles.
|
||||
AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := false
|
||||
BOARD_SUPPORTS_OPENSOURCE_STHAL := false
|
||||
|
||||
# OMX Packages
|
||||
PRODUCT_PACKAGES += \
|
||||
libOmxAacEnc \
|
||||
libOmxAmrEnc \
|
||||
libOmxEvrcEnc \
|
||||
libOmxG711Enc \
|
||||
libOmxQcelp13Enc
|
||||
|
||||
# Audio Packages
|
||||
PRODUCT_PACKAGES += \
|
||||
audio.primary.$(TARGET_BOARD_PLATFORM) \
|
||||
audio.r_submix.default \
|
||||
audio.usb.default \
|
||||
liba2dpoffload \
|
||||
libaudioroute \
|
||||
libbatterylistener \
|
||||
libcirrusspkrprot \
|
||||
libcomprcapture \
|
||||
libexthwplugin \
|
||||
libhdmiedid \
|
||||
libhfp \
|
||||
libqcompostprocbundle \
|
||||
libqcomvisualizer \
|
||||
libqcomvoiceprocessing \
|
||||
libsndmonitor \
|
||||
libspkrprot \
|
||||
libssrec \
|
||||
libtinycompress \
|
||||
libvolumelistener \
|
||||
sound_trigger.primary.$(TARGET_BOARD_PLATFORM)
|
||||
|
||||
# Permissions
|
||||
PRODUCT_COPY_FILES += \
|
||||
frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml
|
||||
|
||||
# Get non-open-source specific aspects.
|
||||
$(call inherit-product-if-exists, vendor/qcom/common/vendor/audio/audio-vendor.mk)
|
||||
Loading…
Reference in New Issue