diff --git a/Android.mk b/Android.mk index 1f475f0..49ac90e 100644 --- a/Android.mk +++ b/Android.mk @@ -29,17 +29,6 @@ LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_SUFFIX := .so include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := vendor.qti.hardware.fm@1.0 -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES_64 := proprietary/lib64/vendor.qti.hardware.fm@1.0.so -LOCAL_SRC_FILES_32 := proprietary/lib/vendor.qti.hardware.fm@1.0.so -LOCAL_MULTILIB := both -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_SUFFIX := .so -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := libgpustats LOCAL_MODULE_OWNER := xiaomi diff --git a/proprietary/lib/com.qualcomm.qti.ant@1.0.so b/proprietary/lib/com.qualcomm.qti.ant@1.0.so deleted file mode 100644 index 8bb0b4c..0000000 Binary files a/proprietary/lib/com.qualcomm.qti.ant@1.0.so and /dev/null differ diff --git a/proprietary/lib/fm_helium.so b/proprietary/lib/fm_helium.so deleted file mode 100644 index 37f4796..0000000 Binary files a/proprietary/lib/fm_helium.so and /dev/null differ diff --git a/proprietary/lib/libantradio.so b/proprietary/lib/libantradio.so index acff34c..10433d9 100644 Binary files a/proprietary/lib/libantradio.so and b/proprietary/lib/libantradio.so differ diff --git a/proprietary/lib/libfm-hci.so b/proprietary/lib/libfm-hci.so deleted file mode 100644 index 1311f7f..0000000 Binary files a/proprietary/lib/libfm-hci.so and /dev/null differ diff --git a/proprietary/lib/vendor.qti.hardware.fm@1.0.so b/proprietary/lib/vendor.qti.hardware.fm@1.0.so deleted file mode 100644 index a6b6b5d..0000000 Binary files a/proprietary/lib/vendor.qti.hardware.fm@1.0.so and /dev/null differ diff --git a/proprietary/lib64/com.qualcomm.qti.ant@1.0.so b/proprietary/lib64/com.qualcomm.qti.ant@1.0.so index 2a1c001..9ac17a0 100644 Binary files a/proprietary/lib64/com.qualcomm.qti.ant@1.0.so and b/proprietary/lib64/com.qualcomm.qti.ant@1.0.so differ diff --git a/proprietary/lib64/fm_helium.so b/proprietary/lib64/fm_helium.so deleted file mode 100644 index 629b71e..0000000 Binary files a/proprietary/lib64/fm_helium.so and /dev/null differ diff --git a/proprietary/lib64/libantradio.so b/proprietary/lib64/libantradio.so index 7b854b5..a73b745 100644 Binary files a/proprietary/lib64/libantradio.so and b/proprietary/lib64/libantradio.so differ diff --git a/proprietary/lib64/libfm-hci.so b/proprietary/lib64/libfm-hci.so deleted file mode 100644 index 3a63e47..0000000 Binary files a/proprietary/lib64/libfm-hci.so and /dev/null differ diff --git a/proprietary/lib64/vendor.qti.hardware.fm@1.0.so b/proprietary/lib64/vendor.qti.hardware.fm@1.0.so deleted file mode 100644 index 81132a2..0000000 Binary files a/proprietary/lib64/vendor.qti.hardware.fm@1.0.so and /dev/null differ diff --git a/proprietary/vendor/bin/fm_qsoc_patches b/proprietary/vendor/bin/fm_qsoc_patches deleted file mode 100755 index 93d274e..0000000 Binary files a/proprietary/vendor/bin/fm_qsoc_patches and /dev/null differ diff --git a/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti b/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti index 9c7da28..2c3d39f 100644 Binary files a/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti and b/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti differ diff --git a/proprietary/vendor/lib/com.qualcomm.qti.ant@1.0.so b/proprietary/vendor/lib/com.qualcomm.qti.ant@1.0.so deleted file mode 100644 index d2315f0..0000000 Binary files a/proprietary/vendor/lib/com.qualcomm.qti.ant@1.0.so and /dev/null differ diff --git a/proprietary/vendor/lib/hw/com.qualcomm.qti.ant@1.0-impl.so b/proprietary/vendor/lib/hw/com.qualcomm.qti.ant@1.0-impl.so deleted file mode 100644 index 8a0b231..0000000 Binary files a/proprietary/vendor/lib/hw/com.qualcomm.qti.ant@1.0-impl.so and /dev/null differ diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.fm@1.0-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.fm@1.0-impl.so deleted file mode 100644 index 537d8ef..0000000 Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.fm@1.0-impl.so and /dev/null differ diff --git a/proprietary/vendor/lib/vendor.qti.hardware.fm@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.fm@1.0.so deleted file mode 100644 index 9a6894e..0000000 Binary files a/proprietary/vendor/lib/vendor.qti.hardware.fm@1.0.so and /dev/null differ diff --git a/proprietary/vendor/lib64/com.qualcomm.qti.ant@1.0.so b/proprietary/vendor/lib64/com.qualcomm.qti.ant@1.0.so index 036ca3b..75fbecc 100644 Binary files a/proprietary/vendor/lib64/com.qualcomm.qti.ant@1.0.so and b/proprietary/vendor/lib64/com.qualcomm.qti.ant@1.0.so differ diff --git a/proprietary/vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so b/proprietary/vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so index ab366f0..d2eb1a0 100644 Binary files a/proprietary/vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so and b/proprietary/vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so differ diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so deleted file mode 100644 index 33a165a..0000000 Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so deleted file mode 100644 index 981a16d..0000000 Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so and /dev/null differ diff --git a/sdm660-common-vendor.mk b/sdm660-common-vendor.mk index e2a4667..410aa36 100644 --- a/sdm660-common-vendor.mk +++ b/sdm660-common-vendor.mk @@ -60,12 +60,9 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/framework/vendor.qti.hardware.soter-V1.0-java.jar:system/framework/vendor.qti.hardware.soter-V1.0-java.jar \ vendor/xiaomi/sdm660-common/proprietary/framework/vendor.qti.ims.callinfo-V1.0-java.jar:system/framework/vendor.qti.ims.callinfo-V1.0-java.jar \ vendor/xiaomi/sdm660-common/proprietary/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar:system/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar \ - vendor/xiaomi/sdm660-common/proprietary/lib/com.qualcomm.qti.ant@1.0.so:system/lib/com.qualcomm.qti.ant@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:system/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/lib/extractors/libmmparser.so:system/lib/extractors/libmmparser.so \ - vendor/xiaomi/sdm660-common/proprietary/lib/fm_helium.so:system/lib/fm_helium.so \ vendor/xiaomi/sdm660-common/proprietary/lib/libFileMux.so:system/lib/libFileMux.so \ - vendor/xiaomi/sdm660-common/proprietary/lib/libfm-hci.so:system/lib/libfm-hci.so \ vendor/xiaomi/sdm660-common/proprietary/lib/libOmxMux.so:system/lib/libOmxMux.so \ vendor/xiaomi/sdm660-common/proprietary/lib/libmmosal.so:system/lib/libmmosal.so \ vendor/xiaomi/sdm660-common/proprietary/lib/libmmparser_lite.so:system/lib/libmmparser_lite.so \ @@ -104,9 +101,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/lib64/lib-imsvt.so:system/lib64/lib-imsvt.so \ vendor/xiaomi/sdm660-common/proprietary/lib64/lib-imsvtextutils.so:system/lib64/lib-imsvtextutils.so \ vendor/xiaomi/sdm660-common/proprietary/lib64/lib-imsvtutils.so:system/lib64/lib-imsvtutils.so \ - vendor/xiaomi/sdm660-common/proprietary/lib64/fm_helium.so:system/lib64/fm_helium.so \ vendor/xiaomi/sdm660-common/proprietary/lib64/libFileMux.so:system/lib64/libFileMux.so \ - vendor/xiaomi/sdm660-common/proprietary/lib64/libfm-hci.so:system/lib64/libfm-hci.so \ vendor/xiaomi/sdm660-common/proprietary/lib64/libOmxMux.so:system/lib64/libOmxMux.so \ vendor/xiaomi/sdm660-common/proprietary/lib64/libaptXHD_encoder.so:system/lib64/libaptXHD_encoder.so \ vendor/xiaomi/sdm660-common/proprietary/lib64/libaptX_encoder.so:system/lib64/libaptX_encoder.so \ @@ -139,7 +134,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/vendor/bin/cnss-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/cnss-daemon \ vendor/xiaomi/sdm660-common/proprietary/vendor/bin/dpmQmiMgr:$(TARGET_COPY_OUT_VENDOR)/bin/dpmQmiMgr \ vendor/xiaomi/sdm660-common/proprietary/vendor/bin/energy-awareness:$(TARGET_COPY_OUT_VENDOR)/bin/energy-awareness \ - vendor/xiaomi/sdm660-common/proprietary/vendor/bin/fm_qsoc_patches:$(TARGET_COPY_OUT_VENDOR)/bin/fm_qsoc_patches \ vendor/xiaomi/sdm660-common/proprietary/vendor/bin/garden_app:$(TARGET_COPY_OUT_VENDOR)/bin/garden_app \ vendor/xiaomi/sdm660-common/proprietary/vendor/bin/hci_qcomm_init:$(TARGET_COPY_OUT_VENDOR)/bin/hci_qcomm_init \ vendor/xiaomi/sdm660-common/proprietary/vendor/bin/hvdcp_opti:$(TARGET_COPY_OUT_VENDOR)/bin/hvdcp_opti \ @@ -233,7 +227,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/vendor/firmware/a530_gpmu.fw2:$(TARGET_COPY_OUT_VENDOR)/firmware/a530_gpmu.fw2 \ vendor/xiaomi/sdm660-common/proprietary/vendor/firmware/a530_pfp.fw:$(TARGET_COPY_OUT_VENDOR)/firmware/a530_pfp.fw \ vendor/xiaomi/sdm660-common/proprietary/vendor/firmware/a530_pm4.fw:$(TARGET_COPY_OUT_VENDOR)/firmware/a530_pm4.fw \ - vendor/xiaomi/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qualcomm.qti.ant@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qualcomm.qti.wifidisplayhal@1.0-halimpl.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/egl/eglSubDriverAndroid.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/eglSubDriverAndroid.so \ @@ -244,11 +237,9 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/egl/libq3dtools_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libq3dtools_adreno.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/egl/libq3dtools_esx.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libq3dtools_esx.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so \ - vendor/xiaomi/sdm660-common/proprietary/vendor/lib/hw/com.qualcomm.qti.ant@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/com.qualcomm.qti.ant@1.0-impl.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/hw/sound_trigger.primary.sdm660.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/sound_trigger.primary.sdm660.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.esepowermanager@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.esepowermanager@1.0-impl.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.hardware.alarm@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.alarm@1.0-impl.so \ - vendor/xiaomi/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.hardware.fm@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.fm@1.0-impl.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/hw/vendor.qti.hardware.iop@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.iop@2.0-impl.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/hw/vulkan.sdm660.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vulkan.sdm660.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/libAlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libAlacSwDec.so \ @@ -342,7 +333,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/soundfx/libdirac.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libdirac.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/vendor.qti.esepowermanager@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.esepowermanager@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.alarm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.alarm@1.0.so \ - vendor/xiaomi/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.fm@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.iop@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.iop@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.iop@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.iop@2.0.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib/vendor.qti.hardware.perf@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.perf@1.0.so \ @@ -367,7 +357,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.gnss@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.gnss@2.0-impl.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so \ - vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.iop@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.iop@2.0-impl.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vulkan.sdm660.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vulkan.sdm660.so \ @@ -530,7 +519,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.2.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@2.0.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.alarm@1.0.so \ - vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.fm@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.latency@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.latency@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.qmi@1.0.so \ @@ -566,7 +554,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ libantradio \ - vendor.qti.hardware.fm@1.0 \ libgpustats \ com.quicinc.cne.api@1.0 \ com.quicinc.cne.api@1.1 \