zenfone9: Drop prebuilts hostpad and supplicant wifi hals
Build android.hardware.wifi.hostapd to vendor for cne lib
Fix: F linker : CANNOT LINK EXECUTABLE "/system/vendor/bin/cnd": library "android.hardware.wifi.hostapd@1.0.so" not found: needed by /vendor/lib64/libcne.so in namespace (default)
Change-Id: I52870f4b86fde69e9f87286b164e727a524148f8
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/device.mk b/device.mk
index 29d25e9..03c6532 100755
--- a/device.mk
+++ b/device.mk
@@ -356,6 +356,7 @@
# Wifi
PRODUCT_PACKAGES += \
+ android.hardware.wifi.hostapd@1.0.vendor \
android.hardware.wifi-service \
hostapd \
libwifi-hal-qcom \
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index d0490fa..8badc52 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -1127,7 +1127,6 @@
-vendor/etc/vintf/manifest/android.hardware.security.keymint-service-qti.xml
-vendor/etc/vintf/manifest/android.hardware.sensors@2.1-multihal.xml
-vendor/etc/vintf/manifest/android.hardware.thermal@2.0-service.qti.xml
--vendor/etc/vintf/manifest/android.hardware.wifi.supplicant.xml
-vendor/etc/vintf/manifest/c2_manifest_vendor.xml
-vendor/etc/vintf/manifest/c2_manifest_vendor_audio.xml
-vendor/etc/vintf/manifest/dataconnection-saidl.xml
@@ -1604,8 +1603,6 @@
vendor/lib/android.hardware.soundtrigger@2.1.so
vendor/lib/android.hardware.soundtrigger@2.2.so
vendor/lib/android.hardware.soundtrigger@2.3.so
-vendor/lib/android.hardware.wifi.hostapd@1.0.so
-vendor/lib/android.hardware.wifi.supplicant@1.0.so
vendor/lib/android.hidl.allocator@1.0.so
vendor/lib/android.hidl.memory.block@1.0.so
vendor/lib/android.system.net.netd@1.0.so
@@ -2625,15 +2622,6 @@
vendor/lib64/android.hardware.tetheroffload.control@1.1.so
vendor/lib64/android.hardware.thermal@1.0.so
vendor/lib64/android.hardware.thermal@2.0.so
-vendor/lib64/android.hardware.wifi.hostapd@1.0.so
-vendor/lib64/android.hardware.wifi.hostapd@1.1.so
-vendor/lib64/android.hardware.wifi.hostapd@1.2.so
-vendor/lib64/android.hardware.wifi.hostapd@1.3.so
-vendor/lib64/android.hardware.wifi.supplicant@1.0.so
-vendor/lib64/android.hardware.wifi.supplicant@1.1.so
-vendor/lib64/android.hardware.wifi.supplicant@1.2.so
-vendor/lib64/android.hardware.wifi.supplicant@1.3.so
-vendor/lib64/android.hardware.wifi.supplicant@1.4.so
vendor/lib64/android.hardware.wifi@1.0.so
vendor/lib64/android.hardware.wifi@1.1.so
vendor/lib64/android.hardware.wifi@1.2.so
@@ -3570,13 +3558,7 @@
vendor/lib64/vendor.qti.hardware.vpp@1.2.so
vendor/lib64/vendor.qti.hardware.vpp@1.3.so
vendor/lib64/vendor.qti.hardware.vpp@2.0.so
-vendor/lib64/vendor.qti.hardware.wifi.hostapd@1.0.so
-vendor/lib64/vendor.qti.hardware.wifi.hostapd@1.1.so
-vendor/lib64/vendor.qti.hardware.wifi.hostapd@1.2.so
vendor/lib64/vendor.qti.hardware.wifi.keystore@1.0.so
-vendor/lib64/vendor.qti.hardware.wifi.supplicant@2.0.so
-vendor/lib64/vendor.qti.hardware.wifi.supplicant@2.1.so
-vendor/lib64/vendor.qti.hardware.wifi.supplicant@2.2.so
vendor/lib64/vendor.qti.hardware.wifi.wificfr@1.0.so
vendor/lib64/vendor.qti.hardware.wigig.netperftuner@1.0.so
vendor/lib64/vendor.qti.ims.callcapability@1.0.so
diff --git a/regen-vendor.sh b/regen-vendor.sh
index 4f15897..ebcfe3c 100755
--- a/regen-vendor.sh
+++ b/regen-vendor.sh
@@ -1150,6 +1150,24 @@
"firmware/wlan/qca_cld/qca6490/COUNTRY"
"firmware/wlan/qca_cld/qca6490/WCNSS_qcom_cfg.ini"
"firmware/wlan/qca_cld/qca6490/wlan_mac.bin"
+ "etc/vintf/manifest/android.hardware.wifi.supplicant.xml"
+ "lib/android.hardware.wifi.hostapd@1.0.so"
+ "lib/android.hardware.wifi.supplicant@1.0.so"
+ "lib64/android.hardware.wifi.hostapd@1.0.so"
+ "lib64/android.hardware.wifi.hostapd@1.1.so"
+ "lib64/android.hardware.wifi.hostapd@1.2.so"
+ "lib64/android.hardware.wifi.hostapd@1.3.so"
+ "lib64/android.hardware.wifi.supplicant@1.0.so"
+ "lib64/android.hardware.wifi.supplicant@1.1.so"
+ "lib64/android.hardware.wifi.supplicant@1.2.so"
+ "lib64/android.hardware.wifi.supplicant@1.3.so"
+ "lib64/android.hardware.wifi.supplicant@1.4.so"
+ "lib64/vendor.qti.hardware.wifi.hostapd@1.0.so"
+ "lib64/vendor.qti.hardware.wifi.hostapd@1.1.so"
+ "lib64/vendor.qti.hardware.wifi.hostapd@1.2.so"
+ "lib64/vendor.qti.hardware.wifi.supplicant@2.0.so"
+ "lib64/vendor.qti.hardware.wifi.supplicant@2.1.so"
+ "lib64/vendor.qti.hardware.wifi.supplicant@2.2.so"
# WifiDisplay
"bin/wfdhdcphalservice"
@@ -1226,7 +1244,6 @@
as_module "etc/vintf/manifest/android.hardware.security.keymint-service-qti.xml"
as_module "etc/vintf/manifest/android.hardware.sensors@2.1-multihal.xml"
as_module "etc/vintf/manifest/android.hardware.usb.gadget@1.1-service.xml"
-as_module "etc/vintf/manifest/android.hardware.wifi.supplicant.xml"
as_module "etc/vintf/manifest/c2_manifest_vendor_audio.xml"
as_module "etc/vintf/manifest/dataconnection-saidl.xml"
as_module "etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml"