From 45daab797e005665e820542aa142d6d1a587911c Mon Sep 17 00:00:00 2001 From: Nick C Date: Tue, 25 Aug 2020 11:39:08 +0300 Subject: [PATCH] sm6250-common: add FM --- BoardConfigCommon.mk | 5 +++++ common.mk | 10 ++++++++++ proprietary-files.txt | 5 ----- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 7d019c4..beae103 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -56,6 +56,11 @@ TARGET_SCREEN_DENSITY := 440 # Filesystem TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs +# FM +AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true +BOARD_HAS_QCA_FM_SOC := cherokee +BOARD_HAVE_QCOM_FM := true + # Kernel BOARD_KERNEL_BASE := 0x00000000 BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb diff --git a/common.mk b/common.mk index 7cde3c3..8f1dbff 100644 --- a/common.mk +++ b/common.mk @@ -35,6 +35,16 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \ frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml +# FM +PRODUCT_PACKAGES += \ + FM2 \ + libqcomfm_jni \ + qcom.fmradio \ + qcom.fmradio.xml + +PRODUCT_BOOT_JARS += \ + qcom.fmradio + # AVB PRODUCT_PACKAGES += \ q-gsi.avbpubkey \ diff --git a/proprietary-files.txt b/proprietary-files.txt index 262f1db..d206572 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -17,7 +17,6 @@ product/lib64/libdpmtcm.so lib64/fm_helium.so lib64/libfm-hci.so -product/lib64/vendor.qti.hardware.fm@1.0.so -vendor/bin/fm_qsoc_patches vendor/lib64/ftm_fm_lib.so vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so vendor/lib64/vendor.qti.hardware.fm@1.0.so @@ -690,7 +689,6 @@ vendor/lib/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so vendor/lib/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so vendor/lib/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so vendor/lib/hw/vendor.qti.hardware.cvp@1.0-impl.so -vendor/lib/hw/vendor.qti.hardware.fm@1.0-impl.so vendor/lib/hw/vendor.qti.hardware.iop@2.0-impl.so vendor/lib/hw/vendor.qti.hardware.servicetracker@1.1-impl.so vendor/lib/hw/vendor.qti.power.pasrmanager@1.0-impl.so @@ -1121,7 +1119,6 @@ vendor/lib/vendor.qti.hardware.display.mapper@2.0.so vendor/lib/vendor.qti.hardware.display.mapper@3.0.so vendor/lib/vendor.qti.hardware.display.mapperextensions@1.0.so vendor/lib/vendor.qti.hardware.display.mapperextensions@1.1.so -vendor/lib/vendor.qti.hardware.fm@1.0.so vendor/lib/vendor.qti.hardware.iop@2.0.so vendor/lib/vendor.qti.hardware.perf@2.0.so vendor/lib/vendor.qti.hardware.radio.am@1.0.so @@ -1342,7 +1339,6 @@ vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so vendor/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so vendor/lib64/hw/vendor.qti.hardware.cvp@1.0-impl.so -vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so vendor/lib64/hw/vendor.qti.hardware.iop@2.0-impl.so vendor/lib64/hw/vendor.qti.hardware.servicetracker@1.1-impl.so vendor/lib64/hw/vendor.qti.power.pasrmanager@1.0-impl.so @@ -1776,7 +1772,6 @@ vendor/lib64/vendor.qti.hardware.display.mapper@2.0.so vendor/lib64/vendor.qti.hardware.display.mapper@3.0.so vendor/lib64/vendor.qti.hardware.display.mapperextensions@1.0.so vendor/lib64/vendor.qti.hardware.display.mapperextensions@1.1.so -vendor/lib64/vendor.qti.hardware.fm@1.0.so vendor/lib64/vendor.qti.hardware.iop@2.0.so vendor/lib64/vendor.qti.hardware.perf@2.0.so vendor/lib64/vendor.qti.hardware.radio.am@1.0.so