zippo: decommonize fm

heart doesn't have a 3.5mm headphone jack. Only leave our bluetooth's fm blob
dependency in sm8150-common and the rest can be moved to zippo.

Change-Id: Id81e6df3fb5e03d1a19b9df3b0d5522bf766a577
This commit is contained in:
Marc Bourgoin
2021-08-30 23:03:23 -06:00
committed by chematelegram
parent 22099395f9
commit 69401f731a
4 changed files with 42 additions and 9 deletions

View File

@@ -13,6 +13,9 @@ DEVICE_PATH := device/lenovo/zippo
TARGET_BOARD_INFO_FILE ?= $(DEVICE_PATH)/board-info.txt
TARGET_OTA_ASSERT_DEVICE := zippo
# FM
BOARD_HAVE_QCOM_FM := true
# HIDL
DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml

View File

@@ -4,15 +4,6 @@
# SPDX-License-Identifier: Apache-2.0
#
# Audio
PRODUCT_PACKAGES += \
android.hardware.audio@6.0-impl \
android.hardware.audio.effect@6.0-impl \
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/audio/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil.xml \
$(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml
# Get non-open-source specific aspects
$(call inherit-product-if-exists, vendor/lenovo/zippo/zippo-vendor.mk)
@@ -25,6 +16,25 @@ TARGET_FACE_UNLOCK := true
PRODUCT_PACKAGES += \
FaceUnlockService
# Audio
PRODUCT_PACKAGES += \
android.hardware.audio@6.0-impl \
android.hardware.audio.effect@6.0-impl \
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/audio/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil.xml \
$(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml
# FM
PRODUCT_PACKAGES += \
FM2 \
libqcomfm_jni \
qcom.fmradio
# Overlays
DEVICE_PACKAGE_OVERLAYS += \
$(LOCAL_PATH)/overlay
# Sensors
PRODUCT_PACKAGES += \
android.hardware.sensors@2.0-service.multihal \

View File

@@ -17,4 +17,13 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>vendor.qti.hardware.fm</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IFmHci</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

View File

@@ -281,6 +281,17 @@ vendor/lib64/vendor.qti.hardware.camera.device@1.0.so
vendor/lib/hw/sensors.hal.tof.so
vendor/lib64/hw/sensors.hal.tof.so
# FM
product/lib/vendor.qti.hardware.fm@1.0.so:system_ext/lib/vendor.qti.hardware.fm@1.0.so
product/lib64/vendor.qti.hardware.fm@1.0.so:system_ext/lib64/vendor.qti.hardware.fm@1.0.so
system/lib/fm_helium.so:system_ext/lib/fm_helium.so
system/lib/libfm-hci.so:system_ext/lib/libfm-hci.so
system/lib64/fm_helium.so:system_ext/lib64/fm_helium.so
system/lib64/libfm-hci.so:system_ext/lib64/libfm-hci.so
vendor/bin/fm_qsoc_patches
vendor/lib/hw/vendor.qti.hardware.fm@1.0-impl.so
vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so
# Sensors
vendor/bin/hw/vendor.qti.hardware.sensorscalibrate@1.0-service
vendor/bin/sensors.qti