From d5d80a5347fc9a38cf3a5c08ed38a65e565c3b01 Mon Sep 17 00:00:00 2001 From: Marc Bourgoin Date: Sun, 4 Jul 2021 15:02:02 -0600 Subject: [PATCH] sm6150-common: Drop QCOM WFD Change-Id: I3dd591444dc54ebe3a32e0385cbfc3db6bfc5e1f --- BoardConfigCommon.mk | 1 - configs/hidl/manifest-qva.xml | 50 ----------------- configs/permissions/qti_whitelist.xml | 2 - extract-files.sh | 3 - proprietary-files.txt | 80 --------------------------- sm6150.mk | 11 ---- 6 files changed, 147 deletions(-) delete mode 100644 configs/hidl/manifest-qva.xml diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index db30de4..924bf2f 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -84,7 +84,6 @@ LOC_HIDL_VERSION := 4.0 DEVICE_MANIFEST_FILE := $(COMMON_PATH)/configs/hidl/manifest.xml DEVICE_MANIFEST_FILE += hardware/qcom-caf/sm8150/media/conf_files/sm6150/c2_manifest.xml DEVICE_MATRIX_FILE := $(COMMON_PATH)/configs/hidl/compatibility_matrix.xml -ODM_MANIFEST_FILES += $(COMMON_PATH)/configs/hidl/manifest-qva.xml # Kernel BOARD_KERNEL_BASE := 0x00000000 diff --git a/configs/hidl/manifest-qva.xml b/configs/hidl/manifest-qva.xml deleted file mode 100644 index fefa5df..0000000 --- a/configs/hidl/manifest-qva.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - vendor.qti.hardware.wifidisplaysession - hwbinder - 1.0 - - IWifiDisplaySession - wifidisplaysession - - - IWifiDisplaySessionAudioTrack - wifidisplaysessionaudiotrack - - - IWifiDisplaySessionImageTrack - wifidisplaysessionimagetrack - - - IWifiDisplaySessionVideoTrack - wifidisplaysessionvideotrack - - - diff --git a/configs/permissions/qti_whitelist.xml b/configs/permissions/qti_whitelist.xml index 6b87e08..612e27e 100644 --- a/configs/permissions/qti_whitelist.xml +++ b/configs/permissions/qti_whitelist.xml @@ -43,7 +43,5 @@ - - diff --git a/extract-files.sh b/extract-files.sh index 6691ae5..dac7729 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -60,9 +60,6 @@ fi function blob_fixup() { case "${1}" in - system_ext/lib64/libwfdnative.so) - "${PATCHELF}" --remove-needed "android.hidl.base@1.0.so" "${2}" - ;; esac } diff --git a/proprietary-files.txt b/proprietary-files.txt index daf05cb..2c59557 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -528,85 +528,5 @@ vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc vendor/etc/init/init.time_daemon.rc -vendor/lib64/libtime_genoff.so -# WiFi Display --framework/WfdCommon.jar --system_ext/bin/wfdservice -system_ext/etc/init/wfdservice.rc -system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml -system_ext/etc/seccomp_policy/wfdservice.policy -system_ext/etc/wfdconfigsink.xml --system_ext/lib/libmmosal.so;MODULE=libmmosal_system_ext --system_ext/lib/libmmparser_lite.so --system_ext/lib/libmmrtpdecoder.so --system_ext/lib/libmmrtpencoder.so --system_ext/lib/libwfdavenhancements.so --system_ext/lib/libwfdcommonutils.so --system_ext/lib/libwfdconfigutils.so --system_ext/lib/libwfddisplayconfig.so --system_ext/lib/libwfdmminterface.so --system_ext/lib/libwfdmmsink.so --system_ext/lib/libwfdmmsrc_system.so --system_ext/lib/libwfdrtsp.so --system_ext/lib/libwfdservice.so --system_ext/lib/libwfdsinksm.so --system_ext/lib/libwfduibcinterface.so --system_ext/lib/libwfduibcsinkinterface.so --system_ext/lib/libwfduibcsink.so --system_ext/lib/libwfduibcsrcinterface.so --system_ext/lib/libwfduibcsrc.so --system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so;MODULE=vendor.qti.hardware.wifidisplaysession@1.0_system_ext --system_ext/lib64/libmmosal.so;MODULE=libmmosal_system_ext --system_ext/lib64/libmmparser_lite.so --system_ext/lib64/libmmrtpdecoder.so --system_ext/lib64/libmmrtpencoder.so --system_ext/lib64/libwfdclient.so --system_ext/lib64/libwfdcommonutils.so --system_ext/lib64/libwfdconfigutils.so --system_ext/lib64/libwfddisplayconfig.so --system_ext/lib64/libwfdmminterface.so --system_ext/lib64/libwfdmmsink.so --system_ext/lib64/libwfdnative.so --system_ext/lib64/libwfdrtsp.so --system_ext/lib64/libwfdsinksm.so --system_ext/lib64/libwfduibcinterface.so --system_ext/lib64/libwfduibcsinkinterface.so --system_ext/lib64/libwfduibcsink.so --system_ext/lib64/libwfduibcsrcinterface.so --system_ext/lib64/libwfduibcsrc.so --system_ext/priv-app/WfdService/WfdService.apk --vendor/bin/wfdvndservice --vendor/bin/wifidisplayhalservice -vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc -vendor/etc/init/wfdvndservice.rc -vendor/etc/seccomp_policy/wfdhdcphalservice.policy -vendor/etc/seccomp_policy/wfdvndservice.policy -vendor/etc/seccomp_policy/wifidisplayhalservice.policy -vendor/etc/wfdconfig.xml --vendor/lib/libFileMux_proprietary.so --vendor/lib/libmmrtpdecoder_proprietary.so --vendor/lib/libmmrtpencoder_proprietary.so --vendor/lib/libwfdcodecv4l2_proprietary.so --vendor/lib/libwfdcommonutils_proprietary.so --vendor/lib/libwfdconfigutils_proprietary.so --vendor/lib/libwfddisplayconfig_proprietary.so --vendor/lib/libwfdhdcpcp.so --vendor/lib/libwfdhdcpservice_proprietary.so --vendor/lib/libwfdmminterface_proprietary.so --vendor/lib/libwfdmmservice_proprietary.so --vendor/lib/libwfdmmsrc_proprietary.so --vendor/lib/libwfdmodulehdcpsession.so --vendor/lib/libwfdrtsp_proprietary.so --vendor/lib/libwfdsessionmodule.so --vendor/lib/libwfdsourcesession_proprietary.so --vendor/lib/libwfdsourcesm_proprietary.so --vendor/lib/libwfduibcinterface_proprietary.so --vendor/lib/libwfduibcsinkinterface_proprietary.so --vendor/lib/libwfduibcsink_proprietary.so --vendor/lib/libwfduibcsrcinterface_proprietary.so --vendor/lib/libwfduibcsrc_proprietary.so --vendor/lib/libwfdutils_proprietary.so --vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so;MODULE=vendor.qti.hardware.wifidisplaysession@1.0_vendor --vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so - # Xiaomi MAC -vendor/bin/nv_mac diff --git a/sm6150.mk b/sm6150.mk index bbf883d..9ce9191 100644 --- a/sm6150.mk +++ b/sm6150.mk @@ -387,17 +387,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.wifi.rtt.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.rtt.xml \ frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml -# WiFi Display -PRODUCT_PACKAGES += \ - libavservices_minijail_32 \ - libdisplayconfig.qti \ - libnl \ - libqdMetaData \ - libwfdaac_vendor - -PRODUCT_BOOT_JARS += \ - WfdCommon - # ZRAM writeback PRODUCT_PROPERTY_OVERRIDES += \ ro.zram.mark_idle_delay_mins=60 \