From a43b71b11d96a5d1f99af51bf3b538793e72f46e Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Fri, 5 Jun 2020 16:23:31 +0530 Subject: [PATCH] sdm660-common: Make FM radio opt-in Change-Id: I2394de5df43aacb69051f8232bfc8f653cf77119 --- BoardConfigCommon.mk | 6 ++++++ common_prop.mk | 3 +++ sdm660.mk | 13 ++++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index e5d5b43d..b681875f 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -57,6 +57,12 @@ TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi TARGET_2ND_CPU_VARIANT := kryo +# FM +ifeq ($(BOARD_HAVE_QCOM_FM),true) +AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true +BOARD_HAS_QCA_FM_SOC := cherokee +endif + # Audio AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true BOARD_USES_ALSA_AUDIO := true diff --git a/common_prop.mk b/common_prop.mk index 23d69508..abd4c414 100644 --- a/common_prop.mk +++ b/common_prop.mk @@ -121,6 +121,9 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.wipower=false \ vendor.qcom.bluetooth.soc=cherokee +PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ + vendor.bluetooth.soc=cherokee + # Camera PRODUCT_PROPERTY_OVERRIDES += \ persist.camera.privapp.list=org.codeaurora.snapcam \ diff --git a/sdm660.mk b/sdm660.mk index b62aa4e8..84441d81 100644 --- a/sdm660.mk +++ b/sdm660.mk @@ -300,12 +300,23 @@ PRODUCT_PACKAGES += \ init.qcom.sh \ init.qcom.usb.rc \ init.qcom.usb.sh \ - init.qti.fm.sh \ init.recovery.qcom.rc \ init.target.rc \ init.xiaomi_parts.rc \ ueventd.qcom.rc +# FM +ifeq ($(BOARD_HAVE_QCOM_FM),true) +PRODUCT_PACKAGES += \ + FM2 \ + libqcomfm_jni \ + qcom.fmradio \ + qcom.fmradio.xml + +PRODUCT_BOOT_JARS += \ + qcom.fmradio +endif + # Ion PRODUCT_PACKAGES += \ libion