sm8150-common: Make FM radio opt-in

Change-Id: Idaebe34e18d16d042e247f0f2b06c8012fe4d287
This commit is contained in:
dianlujitao
2023-07-19 15:55:06 +02:00
committed by Sebastiano Barezzi
parent 7ecb6578b6
commit f871779182
8 changed files with 34 additions and 16 deletions

View File

@@ -65,7 +65,9 @@ TARGET_SURFACEFLINGER_UDFPS_LIB := //hardware/xiaomi:libudfps_extension.xiaomi
endif
# FM
ifeq ($(TARGET_HAS_FM),true)
BOARD_HAVE_QCOM_FM := true
endif
# Init
TARGET_INIT_VENDOR_LIB ?= //$(COMMON_PATH):init_xiaomi_msmnile
@@ -203,6 +205,9 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
$(COMMON_PATH)/framework_compatibility_matrix.xml \
vendor/lineage/config/device_framework_matrix.xml
DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest.xml
ifeq ($(TARGET_HAS_FM),true)
DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest_fm.xml
endif
DEVICE_MATRIX_FILE += $(COMMON_PATH)/compatibility_matrix.xml
ODM_MANIFEST_SKUS += nfc
ODM_MANIFEST_NFC_FILES := $(COMMON_PATH)/manifest_nfc.xml

View File

@@ -67,6 +67,7 @@ if [ -z "${ONLY_FIRMWARE}" ] && [ -z "${ONLY_TARGET}" ]; then
setup_vendor "${DEVICE_COMMON}" "${VENDOR_COMMON:-$VENDOR}" "${ANDROID_ROOT}" true "${CLEAN_VENDOR}"
extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
extract "${MY_DIR}/proprietary-files-fm.txt" "${SRC}" "${KANG}" --section "${SECTION}"
fi
if [ -z "${ONLY_COMMON}" ] && [ -s "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files.txt" ]; then

View File

@@ -154,11 +154,6 @@
<transport>hwbinder</transport>
<fqname>@1.0::IDspService/dspservice</fqname>
</hal>
<hal format="hidl">
<name>vendor.qti.hardware.fm</name>
<transport>hwbinder</transport>
<fqname>@1.0::IFmHci/default</fqname>
</hal>
<hal format="hidl">
<name>vendor.qti.hardware.qccvndhal</name>
<transport>hwbinder</transport>

7
manifest_fm.xml Normal file
View File

@@ -0,0 +1,7 @@
<manifest version="2.0" type="device">
<hal format="hidl">
<name>vendor.qti.hardware.fm</name>
<transport>hwbinder</transport>
<fqname>@1.0::IFmHci/default</fqname>
</hal>
</manifest>

View File

@@ -187,10 +187,12 @@ PRODUCT_PACKAGES += \
endif
# FM
ifeq ($(TARGET_HAS_FM),true)
PRODUCT_PACKAGES += \
FM2 \
libqcomfm_jni \
qcom.fmradio
endif
# Gatekeeper
PRODUCT_PACKAGES += \

14
proprietary-files-fm.txt Normal file
View File

@@ -0,0 +1,14 @@
# All unpinned blobs below are extracted from vayu_global-user 13 RKQ1.200826.002 V14.0.3.0.TJUMIXM release-keys
# FM
system_ext/lib/fm_helium.so
system_ext/lib/libfm-hci.so
system_ext/lib/vendor.qti.hardware.fm@1.0.so
system_ext/lib64/fm_helium.so
system_ext/lib64/libfm-hci.so
system_ext/lib64/vendor.qti.hardware.fm@1.0.so
vendor/bin/fm_qsoc_patches
vendor/etc/init/init.qti.fm.rc
vendor/etc/init.qti.fm.sh
vendor/lib/hw/vendor.qti.hardware.fm@1.0-impl.so
vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so

View File

@@ -253,18 +253,7 @@ vendor/lib64/libtzdrmgenprov.so
vendor/lib64/vendor.qti.hardware.qseecom@1.0.so
# FM
system_ext/lib/fm_helium.so
system_ext/lib/libfm-hci.so
system_ext/lib/vendor.qti.hardware.fm@1.0.so
system_ext/lib64/fm_helium.so
system_ext/lib64/libfm-hci.so
system_ext/lib64/vendor.qti.hardware.fm@1.0.so
vendor/bin/fm_qsoc_patches
vendor/etc/init/init.qti.fm.rc
vendor/etc/init.qti.fm.sh
vendor/lib/hw/vendor.qti.hardware.fm@1.0-impl.so
vendor/lib/vendor.qti.hardware.fm@1.0.so
vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so
vendor/lib64/vendor.qti.hardware.fm@1.0.so
# Gatekeeper

View File

@@ -30,6 +30,11 @@ write_headers "andromeda cepheus crux nabu raphael vayu"
# The standard common blobs
write_makefiles "${MY_DIR}/proprietary-files.txt" true
# Include IR blobs if needed
printf "\n%s\n" "ifeq (\$(TARGET_HAS_FM),true)" >> "${PRODUCTMK}"
write_makefiles "${MY_DIR}/proprietary-files-fm.txt" true
printf "%s\n" "endif" >> "${PRODUCTMK}"
# Finish
write_footers