summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordianlujitao <dianlujitao@lineageos.org>2020-02-07 14:41:31 +0800
committerMichael Bestas <mkbestas@lineageos.org>2020-04-30 00:49:34 +0300
commite0cbfd28c0fee5cb549c9173e3f4998a78d2a304 (patch)
tree0170be4e1d4b4e3b589e3ac379c909423e9fe17d
parentf417401d5b9b0f8e7bd4c04781150394b7569163 (diff)
sdm660-common: Decommonize FM radio
Change-Id: I4c9564aed953013ea34b53ae883b6f5d683980c3
-rw-r--r--BoardConfigCommon.mk5
-rw-r--r--proprietary-files.txt14
-rw-r--r--sdm660.mk10
3 files changed, 1 insertions, 28 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ce8552b..294601c 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -81,7 +81,6 @@ USE_XML_AUDIO_POLICY_CONF := 1
BOARD_SUPPORTS_SOUND_TRIGGER := true
AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true
AUDIO_FEATURE_ENABLED_EXT_AMPLIFIER := false
-AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true
# Bluetooth
BOARD_HAVE_BLUETOOTH_QCOM := true
@@ -139,10 +138,6 @@ ifeq ($(HOST_OS),linux)
endif
endif
-# FM
-BOARD_HAS_QCA_FM_SOC := cherokee
-BOARD_HAVE_QCOM_FM := true
-
# GPS
BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default
LOC_HIDL_VERSION := 3.0
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 75aae74..1d7c777 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -68,6 +68,7 @@ vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so|f9dcf9a19a0b601969
vendor/lib64/libbtnv.so|08fc5c0a38eca63ebe6f0cd854f6525537141d44
vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so|9346946b110086a6b473c8226e072e9a0cdbb87e
vendor/lib64/vendor.qti.hardware.btconfigstore@1.0.so|c51214b092f7e47c2d21989a605c4a8c7e7b85eb
+vendor/lib64/vendor.qti.hardware.fm@1.0.so|073cace3aa8d0ffa025d9df67c45f8a907109339
# Bluetooth (aptX) - from crosshatch-user 10 QP1A.190711.020 5800535 release-keys
product/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc
@@ -166,19 +167,6 @@ vendor/lib64/libSecureUILib.so|3a059d1fe3395eaefeb7817ad3af46987b6f4794
vendor/lib64/libssd.so|a64337d8044607b81adcf7e8c5760cf8cdcf82b4
vendor/lib64/libStDrvInt.so|a7bd8140e2cd5aa70a7d929e01233e5b71844cd8
-# FM - from jasmine
-lib/libfm-hci.so|b066567e07279bf59e78f7d318302dd706bb80fe
-lib/fm_helium.so|fb2a591a61122bbdf818ba9e6c931aa7c3d8a953
-lib64/libfm-hci.so|24cd3321d251409aec7d5b6fe160c9fd37a12af5
-lib64/fm_helium.so|e41e3a18f5a0dc666adad471e7332c707b4d2044
-vendor/bin/fm_qsoc_patches|ea7004d7d85227e56df2f8b49a529df92f6b8726
--lib/vendor.qti.hardware.fm@1.0.so|e383388c912ee43bd00eefcac60e179c863e858b
--lib64/vendor.qti.hardware.fm@1.0.so|5c5beea6433843df16650789c6bab947b371c23a
-vendor/lib/hw/vendor.qti.hardware.fm@1.0-impl.so|967a941dcf364b931e0db4402d0ea028a20ed2ff
-vendor/lib/vendor.qti.hardware.fm@1.0.so|ff103851777cad17b665e1ea2df37deebdcbee43
-vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so|665bdb1a9d0368a0ed45c384c191e5a84c985c8e
-vendor/lib64/vendor.qti.hardware.fm@1.0.so|b1572c12b2e5701c488d65aa4651b8ff9437f6ee
-
# GPS - from jasmine V11.0.8.0.QDIMIXM
etc/permissions/com.qti.location.sdk.xml|cb68a566bd77dcc75bb7547199d528289fac01cb
etc/permissions/com.qualcomm.location.xml|1d36e7cf8e16813aa13ee6b3fca8d8687b543828
diff --git a/sdm660.mk b/sdm660.mk
index 1ccd45d..8f3ef1c 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -218,16 +218,6 @@ PRODUCT_PACKAGES += \
android.hardware.drm@1.0-service \
android.hardware.drm@1.2-service.clearkey
-# FM
-PRODUCT_PACKAGES += \
- FM2 \
- libqcomfm_jni \
- qcom.fmradio \
- qcom.fmradio.xml
-
-PRODUCT_BOOT_JARS += \
- qcom.fmradio
-
PRODUCT_PACKAGES += \
android.hardware.broadcastradio@1.0-impl