remove useless stuff

Change-Id: Ifc8e738dbae49864c997ed00eff02c2682ec387e

diff --git a/proprietary/lib/android.hardware.tetheroffload.config@1.0.so b/proprietary/lib/android.hardware.tetheroffload.config@1.0.so
deleted file mode 100644 (file)
index 0029295..0000000
Binary files a/proprietary/lib/android.hardware.tetheroffload.config@1.0.so and /dev/null differ

diff --git a/proprietary/lib/android.hardware.wifi.supplicant@1.0.so b/proprietary/lib/android.hardware.wifi.supplicant@1.0.so
deleted file mode 100644 (file)
index e94c146..0000000
Binary files a/proprietary/lib/android.hardware.wifi.supplicant@1.0.so and /dev/null differ

diff --git a/proprietary/lib/android.hardware.wifi@1.0.so b/proprietary/lib/android.hardware.wifi@1.0.so
deleted file mode 100644 (file)
index 3aaeb36..0000000
Binary files a/proprietary/lib/android.hardware.wifi@1.0.so and /dev/null differ

diff --git a/proprietary/lib/android.system.wifi.keystore@1.0.so b/proprietary/lib/android.system.wifi.keystore@1.0.so
deleted file mode 100644 (file)
index 83311d6..0000000
Binary files a/proprietary/lib/android.system.wifi.keystore@1.0.so and /dev/null differ

diff --git a/proprietary/lib/system.vendor.samsung.frameworks.ucm.wifi@1.0.so b/proprietary/lib/system.vendor.samsung.frameworks.ucm.wifi@1.0.so
deleted file mode 100644 (file)
index fb7ec90..0000000
Binary files a/proprietary/lib/system.vendor.samsung.frameworks.ucm.wifi@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/android.hardware.tetheroffload.config@1.0.so b/proprietary/lib64/android.hardware.tetheroffload.config@1.0.so
deleted file mode 100644 (file)
index a679ea4..0000000
Binary files a/proprietary/lib64/android.hardware.tetheroffload.config@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/android.hardware.wifi.hostapd@1.0.so b/proprietary/lib64/android.hardware.wifi.hostapd@1.0.so
deleted file mode 100644 (file)
index 4f4bbed..0000000
Binary files a/proprietary/lib64/android.hardware.wifi.hostapd@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/android.hardware.wifi.offload@1.0.so b/proprietary/lib64/android.hardware.wifi.offload@1.0.so
deleted file mode 100644 (file)
index 3bd01d0..0000000
Binary files a/proprietary/lib64/android.hardware.wifi.offload@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/android.hardware.wifi.supplicant@1.0.so b/proprietary/lib64/android.hardware.wifi.supplicant@1.0.so
deleted file mode 100644 (file)
index a3c3e7c..0000000
Binary files a/proprietary/lib64/android.hardware.wifi.supplicant@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/android.hardware.wifi.supplicant@1.1.so b/proprietary/lib64/android.hardware.wifi.supplicant@1.1.so
deleted file mode 100644 (file)
index 415b992..0000000
Binary files a/proprietary/lib64/android.hardware.wifi.supplicant@1.1.so and /dev/null differ

diff --git a/proprietary/lib64/android.hardware.wifi@1.0.so b/proprietary/lib64/android.hardware.wifi@1.0.so
deleted file mode 100644 (file)
index c8bf094..0000000
Binary files a/proprietary/lib64/android.hardware.wifi@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/android.hardware.wifi@1.1.so b/proprietary/lib64/android.hardware.wifi@1.1.so
deleted file mode 100644 (file)
index c03a3c1..0000000
Binary files a/proprietary/lib64/android.hardware.wifi@1.1.so and /dev/null differ

diff --git a/proprietary/lib64/android.hardware.wifi@1.2.so b/proprietary/lib64/android.hardware.wifi@1.2.so
deleted file mode 100644 (file)
index f698337..0000000
Binary files a/proprietary/lib64/android.hardware.wifi@1.2.so and /dev/null differ

diff --git a/proprietary/lib64/android.system.wifi.keystore@1.0.so b/proprietary/lib64/android.system.wifi.keystore@1.0.so
deleted file mode 100644 (file)
index 0dc6a6c..0000000
Binary files a/proprietary/lib64/android.system.wifi.keystore@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/system.vendor.samsung.frameworks.ucm.wifi@1.0.so b/proprietary/lib64/system.vendor.samsung.frameworks.ucm.wifi@1.0.so
deleted file mode 100644 (file)
index c877be3..0000000
Binary files a/proprietary/lib64/system.vendor.samsung.frameworks.ucm.wifi@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/vendor.samsung.hardware.wifi.hostapd@1.0.so b/proprietary/lib64/vendor.samsung.hardware.wifi.hostapd@1.0.so
deleted file mode 100644 (file)
index 2df6784..0000000
Binary files a/proprietary/lib64/vendor.samsung.hardware.wifi.hostapd@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/vendor.samsung.hardware.wifi.supplicant@1.0.so b/proprietary/lib64/vendor.samsung.hardware.wifi.supplicant@1.0.so
deleted file mode 100644 (file)
index ce60bca..0000000
Binary files a/proprietary/lib64/vendor.samsung.hardware.wifi.supplicant@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/vendor.samsung.hardware.wifi@1.0.so b/proprietary/lib64/vendor.samsung.hardware.wifi@1.0.so
deleted file mode 100644 (file)
index e5ff481..0000000
Binary files a/proprietary/lib64/vendor.samsung.hardware.wifi@1.0.so and /dev/null differ

diff --git a/proprietary/vendor/bin/hw/android.hardware.wifi@1.0-service b/proprietary/vendor/bin/hw/android.hardware.wifi@1.0-service
deleted file mode 100644 (file)
index 53c9231..0000000
Binary files a/proprietary/vendor/bin/hw/android.hardware.wifi@1.0-service and /dev/null differ

diff --git a/proprietary/vendor/etc/init/android.hardware.wifi@1.0-service.rc b/proprietary/vendor/etc/init/android.hardware.wifi@1.0-service.rc
deleted file mode 100644 (file)
index cf849d0..0000000
--- a/proprietary/vendor/etc/init/android.hardware.wifi@1.0-service.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-service vendor.wifi_hal_legacy /vendor/bin/hw/android.hardware.wifi@1.0-service
-    class hal
-    capabilities NET_ADMIN NET_RAW SYS_MODULE
-    user wifi
-    group wifi gps

diff --git a/proprietary/vendor/etc/wifi/wldu.conf b/proprietary/vendor/etc/wifi/wldu.conf
deleted file mode 100644 (file)
index 3660a34..0000000
--- a/proprietary/vendor/etc/wifi/wldu.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Uart device port where Debug UART application can control
-UartPort=/dev/ttySAC3
-
-# BaudRate
-BaudRate=460800
-
-# WLDU data file save path
-DataFilePath=/data/media/wifi/log
-
-# WLDU default prefix of data file name
-DataFileNamePrefix=wl_pcie_link_down
-

diff --git a/proprietary/vendor/etc/wifi/wpa_supplicant.conf b/proprietary/vendor/etc/wifi/wpa_supplicant.conf
deleted file mode 100644 (file)
index 4d05858..0000000
--- a/proprietary/vendor/etc/wifi/wpa_supplicant.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-update_config=1
-eapol_version=1
-ap_scan=1
-fast_reauth=1
-p2p_add_cli_chan=1

diff --git a/proprietary/vendor/etc/wlan_common_rc b/proprietary/vendor/etc/wlan_common_rc
deleted file mode 100644 (file)
index 416871f..0000000
--- a/proprietary/vendor/etc/wlan_common_rc
+++ /dev/null
@@ -1,61 +0,0 @@
-# Wi-Fi init file
-on post-fs-data
-    mkdir /data/vendor/conn 0771 wifi root
-    mkdir /data/vendor/wifi 0771 wifi wifi
-    mkdir /data/vendor/wifi/wpa 0770 wifi wifi
-    mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
-    mkdir /data/vendor/log/wifi 0770 wifi system
-
-    # for WIFI TRP/TIS
-    chown wifi root /data/vendor/conn/.psm.info
-    chmod 0660 /data/vendor/conn/.psm.info
-
-    # for WIFI Antenna Selection
-    chown wifi root /data/vendor/conn/.ant.info
-    chmod 0660 /data/vendor/conn/.ant.info
-
-    # for WIFI Version
-    chown wifi root /data/vendor/conn/.wifiver.info
-    chmod 0664 /data/vendor/conn/.wifiver.info
-
-    # for WIFI MEMDUMP
-    # The default value of below memdump file is set in SecProductFeature
-    #write /data/vendor/conn/.memdump.info 2
-    chown wifi root /data/vendor/conn/.memdump.info
-    chmod 0660 /data/vendor/conn/.memdump.info
-
-    # for WIFI hotspot
-    chown wifi root /data/vendor/conn/.softap.info
-    chmod 0664 /data/vendor/conn/.softap.info
-    chown system wifi /vendor/etc/wifi/indoorchannel.info
-    chmod 0664 /vendor/etc/wifi/indoorchannel.info
-
-    # for WIFI MAC
-    chown wifi root /sys/wifi/mac_addr
-    chmod 0660 /sys/wifi/mac_addr
-    
-on boot
-    setprop wifi.interface wlan0
-
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 \
-    -g@android:wpa_wlan0
-    class main
-    socket wpa_wlan0 dgram 660 wifi wifi
-    disabled
-    oneshot
-
-# start for WiFi MFG (TestMode)
-service mfgloader /system/vendor/bin/hw/mfgloader
-    class main
-    disabled
-    oneshot
-
-service macloader /system/vendor/bin/hw/macloader
-    class main
-    oneshot
-
-# end of WiFi MFG (TestMode)
-
-on property:vold.decrypt=trigger_restart_framework
-exec /system/vendor/bin/hw/macloader

diff --git a/proprietary/vendor/lib/libwifi-hal.so b/proprietary/vendor/lib/libwifi-hal.so
deleted file mode 100644 (file)
index 1107206..0000000
Binary files a/proprietary/vendor/lib/libwifi-hal.so and /dev/null differ

diff --git a/proprietary/vendor/lib/libwpa_client.so b/proprietary/vendor/lib/libwpa_client.so
deleted file mode 100644 (file)
index 68171ef..0000000
Binary files a/proprietary/vendor/lib/libwpa_client.so and /dev/null differ

diff --git a/proprietary/vendor/lib64/libkeystore-engine-wifi-hidl.so b/proprietary/vendor/lib64/libkeystore-engine-wifi-hidl.so
deleted file mode 100644 (file)
index ad17d7f..0000000
Binary files a/proprietary/vendor/lib64/libkeystore-engine-wifi-hidl.so and /dev/null differ

diff --git a/proprietary/vendor/lib64/libkeystore-wifi-hidl.so b/proprietary/vendor/lib64/libkeystore-wifi-hidl.so
deleted file mode 100644 (file)
index c05ab89..0000000
Binary files a/proprietary/vendor/lib64/libkeystore-wifi-hidl.so and /dev/null differ

diff --git a/proprietary/vendor/lib64/libwpa_client.so b/proprietary/vendor/lib64/libwpa_client.so
deleted file mode 100644 (file)
index 15fd806..0000000
Binary files a/proprietary/vendor/lib64/libwpa_client.so and /dev/null differ

diff --git a/proprietary/vendor/lib64/vendor.samsung.frameworks.ucm.wifi@1.0.so b/proprietary/vendor/lib64/vendor.samsung.frameworks.ucm.wifi@1.0.so
deleted file mode 100644 (file)
index 387ea00..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.frameworks.ucm.wifi@1.0.so and /dev/null differ

diff --git a/universal8895-common-vendor.mk b/universal8895-common-vendor.mk
index faaff6720efe06fb80a8b01e5cdba9d2b6493b3c..b960ac9f7ffb7d349a0617bddccdf9b2826db280 100644 (file)
--- a/universal8895-common-vendor.mk
+++ b/universal8895-common-vendor.mk
@@ -66,10 +66,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/lib/android.hardware.camera.provider@2.4.so:system/lib/android.hardware.camera.provider@2.4.so \
     vendor/samsung/universal8895-common/proprietary/lib/android.hardware.gnss@1.0.so:system/lib/android.hardware.gnss@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib/android.hardware.gnss@1.1.so:system/lib/android.hardware.gnss@1.1.so \
-    vendor/samsung/universal8895-common/proprietary/lib/android.hardware.tetheroffload.config@1.0.so:system/lib/android.hardware.tetheroffload.config@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib/android.hardware.wifi.supplicant@1.0.so:system/lib/android.hardware.wifi.supplicant@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib/android.hardware.wifi@1.0.so:system/lib/android.hardware.wifi@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib/android.system.wifi.keystore@1.0.so:system/lib/android.system.wifi.keystore@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib/hw/audio.playback_record.default.so:system/lib/hw/audio.playback_record.default.so \
     vendor/samsung/universal8895-common/proprietary/lib/hw/audio.primary.universal8895.so:system/lib/hw/audio.primary.universal8895.so \
     vendor/samsung/universal8895-common/proprietary/lib/hw/audio.tms.default.so:system/lib/hw/audio.tms.default.so \
@@ -126,7 +122,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/lib/omx/libOMX.Exynos.VP9.Decoder.so:system/lib/omx/libOMX.Exynos.VP9.Decoder.so \
     vendor/samsung/universal8895-common/proprietary/lib/omx/libOMX.Exynos.VP9.Encoder.so:system/lib/omx/libOMX.Exynos.VP9.Encoder.so \
     vendor/samsung/universal8895-common/proprietary/lib/omx/libOMX.Exynos.WMV.Decoder.so:system/lib/omx/libOMX.Exynos.WMV.Decoder.so \
-    vendor/samsung/universal8895-common/proprietary/lib/system.vendor.samsung.frameworks.ucm.wifi@1.0.so:system/lib/system.vendor.samsung.frameworks.ucm.wifi@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib/vendor.samsung.hardware.camera.device@1.0.so:system/lib/vendor.samsung.hardware.camera.device@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib/vendor.samsung.hardware.camera.device@3.2.so:system/lib/vendor.samsung.hardware.camera.device@3.2.so \
     vendor/samsung/universal8895-common/proprietary/lib/vendor.samsung.hardware.camera.device@3.3.so:system/lib/vendor.samsung.hardware.camera.device@3.3.so \
@@ -151,15 +146,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.gnss@1.1.so:system/lib64/android.hardware.gnss@1.1.so \
     vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.nfc@1.0.so:system/lib64/android.hardware.nfc@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.nfc@1.1.so:system/lib64/android.hardware.nfc@1.1.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.tetheroffload.config@1.0.so:system/lib64/android.hardware.tetheroffload.config@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.wifi.hostapd@1.0.so:system/lib64/android.hardware.wifi.hostapd@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.wifi.offload@1.0.so:system/lib64/android.hardware.wifi.offload@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.wifi.supplicant@1.0.so:system/lib64/android.hardware.wifi.supplicant@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.wifi.supplicant@1.1.so:system/lib64/android.hardware.wifi.supplicant@1.1.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.wifi@1.0.so:system/lib64/android.hardware.wifi@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.wifi@1.1.so:system/lib64/android.hardware.wifi@1.1.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.wifi@1.2.so:system/lib64/android.hardware.wifi@1.2.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/android.system.wifi.keystore@1.0.so:system/lib64/android.system.wifi.keystore@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/hw/camera.universal8895.so:system/lib64/hw/camera.universal8895.so \
     vendor/samsung/universal8895-common/proprietary/lib64/hw/gralloc.exynos5.so:system/lib64/hw/gralloc.exynos5.so \
     vendor/samsung/universal8895-common/proprietary/lib64/libExynosOMX_Core.so:system/lib64/libExynosOMX_Core.so \
@@ -204,7 +190,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/lib64/omx/libOMX.Exynos.VP9.Decoder.so:system/lib64/omx/libOMX.Exynos.VP9.Decoder.so \
     vendor/samsung/universal8895-common/proprietary/lib64/omx/libOMX.Exynos.VP9.Encoder.so:system/lib64/omx/libOMX.Exynos.VP9.Encoder.so \
     vendor/samsung/universal8895-common/proprietary/lib64/omx/libOMX.Exynos.WMV.Decoder.so:system/lib64/omx/libOMX.Exynos.WMV.Decoder.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/system.vendor.samsung.frameworks.ucm.wifi@1.0.so:system/lib64/system.vendor.samsung.frameworks.ucm.wifi@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.bluetooth@1.0.so:system/lib64/vendor.samsung.hardware.bluetooth@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.camera.device@1.0.so:system/lib64/vendor.samsung.hardware.camera.device@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.camera.device@3.2.so:system/lib64/vendor.samsung.hardware.camera.device@3.2.so \
@@ -218,9 +203,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.radio.secbridge@1.0.so:system/lib64/vendor.samsung.hardware.radio.secbridge@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.radio.sechook@1.0.so:system/lib64/vendor.samsung.hardware.radio.sechook@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.radio@1.2.so:system/lib64/vendor.samsung.hardware.radio@1.2.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.wifi.hostapd@1.0.so:system/lib64/vendor.samsung.hardware.wifi.hostapd@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.wifi.supplicant@1.0.so:system/lib64/vendor.samsung.hardware.wifi.supplicant@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.wifi@1.0.so:system/lib64/vendor.samsung.hardware.wifi@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0.so:system/lib64/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.trustonic.tee@1.0.so:system/lib64/vendor.trustonic.tee@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.trustonic.teeregistry@1.0.so:system/lib64/vendor.trustonic.teeregistry@1.0.so \
@@ -255,7 +237,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/bin/cbd:$(TARGET_COPY_OUT_VENDOR)/bin/cbd \
     vendor/samsung/universal8895-common/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.bluetooth@1.0-service \
     vendor/samsung/universal8895-common/proprietary/vendor/bin/hw/android.hardware.drm@1.1-service.widevine:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.drm@1.1-service.widevine \
-    vendor/samsung/universal8895-common/proprietary/vendor/bin/hw/android.hardware.wifi@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.wifi@1.0-service \
     vendor/samsung/universal8895-common/proprietary/vendor/bin/hw/gpsd:$(TARGET_COPY_OUT_VENDOR)/bin/hw/gpsd \
     vendor/samsung/universal8895-common/proprietary/vendor/bin/hw/lhd:$(TARGET_COPY_OUT_VENDOR)/bin/hw/lhd \
     vendor/samsung/universal8895-common/proprietary/vendor/bin/hw/macloader:$(TARGET_COPY_OUT_VENDOR)/bin/hw/macloader \
@@ -283,7 +264,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.bluetooth@1.0-service.rc \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/init/android.hardware.drm@1.1-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.1-service.widevine.rc \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service.rc \
-    vendor/samsung/universal8895-common/proprietary/vendor/etc/init/android.hardware.wifi@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.wifi@1.0-service.rc \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/init/init.gps.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.gps.rc \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/init/init.vendor.rilchip.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.vendor.rilchip.rc \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/init/init.vendor.rilcommon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.vendor.rilcommon.rc \
@@ -331,10 +311,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/wifi/nvram.txt_r02g_b0:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/nvram.txt_r02g_b0 \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/wifi/nvram.txt_r02j_b0:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/nvram.txt_r02j_b0 \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
-    vendor/samsung/universal8895-common/proprietary/vendor/etc/wifi/wldu.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wldu.conf \
-    vendor/samsung/universal8895-common/proprietary/vendor/etc/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
-    vendor/samsung/universal8895-common/proprietary/vendor/etc/wlan_common_rc:$(TARGET_COPY_OUT_VENDOR)/etc/wlan_common_rc \
     vendor/samsung/universal8895-common/proprietary/vendor/firmware/APBargeIn_AUDIO_SLSI.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/APBargeIn_AUDIO_SLSI.bin \
     vendor/samsung/universal8895-common/proprietary/vendor/firmware/APBiBF_AUDIO_SLSI.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/APBiBF_AUDIO_SLSI.bin \
     vendor/samsung/universal8895-common/proprietary/vendor/firmware/AP_AUDIO_SLSI.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/AP_AUDIO_SLSI.bin \
@@ -434,8 +411,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/libsynaFpSensorTestNwd.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsynaFpSensorTestNwd.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/libvndsecril-client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvndsecril-client.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/libvxu.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvxu.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib/libwifi-hal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwifi-hal.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib/libwpa_client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwpa_client.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/libwrappergps.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwrappergps.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/libwvhidl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwvhidl.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/libxcv.camera.samsung.so:$(TARGET_COPY_OUT_VENDOR)/lib/libxcv.camera.samsung.so \
@@ -493,8 +468,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libiva_android_hal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libiva_android_hal.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libkeymaster_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymaster_helper.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libkeymaster_mdfpp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymaster_mdfpp.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib64/libkeystore-engine-wifi-hidl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeystore-engine-wifi-hidl.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib64/libkeystore-wifi-hidl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeystore-wifi-hidl.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libmpp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmpp.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libopenvx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libopenvx.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libqfp_sensortest.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqfp_sensortest.so \
@@ -514,7 +487,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libsynaFpSensorTestNwd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsynaFpSensorTestNwd.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libvndsecril-client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvndsecril-client.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libvxu.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvxu.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib64/libwpa_client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwpa_client.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libwrappergps.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwrappergps.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libxcv.camera.samsung.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxcv.camera.samsung.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/nfc_nci_sec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/nfc_nci_sec.so \
@@ -526,8 +498,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/vendor.samsung.camera.device@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.samsung.camera.device@1.0-impl.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/vendor.samsung.camera.device@3.2-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.samsung.camera.device@3.2-impl.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/vendor.samsung.camera.device@3.3-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.samsung.camera.device@3.3-impl.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib64/vendor.samsung.camera.device@3.4-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.samsung.camera.device@3.4-impl.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib64/vendor.samsung.frameworks.ucm.wifi@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.samsung.frameworks.ucm.wifi@1.0.so
+    vendor/samsung/universal8895-common/proprietary/vendor/lib64/vendor.samsung.camera.device@3.4-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.samsung.camera.device@3.4-impl.so
 
 # Create Mali links for Vulkan and OpenCL
 PRODUCT_PACKAGES += libGLES_mali