[TMP] Revert "Aerodactyl: Switch back to the prebuilt wifi HAL"

This reverts commit 633085b5c5.

Aerodactyl-vendor.mk

@@ -238,6 +238,7 @@ PRODUCT_COPY_FILES += \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/android.hardware.neuralnetworks-shim-service-mtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks-shim-service-mtk.rc \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/android.hardware.security.keymint@2.0-service.trustonic.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.security.keymint@2.0-service.trustonic.rc \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/camerahalserver.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/camerahalserver.rc \
+    vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/chipinfo_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/chipinfo_init.rc \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/fuelgauged_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_init.rc \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/fuelgauged_nvram_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_nvram_init.rc \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/init.bip_ap.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.bip_ap.rc \
@@ -634,7 +635,6 @@ PRODUCT_PACKAGES += \
     libvpu \
     libwa_opticalzoomfactor \
     libwa_sat \
-    libwifi-hal-mtk \
     libwpfa \
     libwvaidl \
     arm.graphics-V3-ndk \
@@ -1152,6 +1152,7 @@ PRODUCT_PACKAGES += \
     bip_ap \
     ccci_mdinit \
     ccci_rpcd \
+    chipinfo \
     conninfra_loader \
     fuelgauged \
     fuelgauged_nvram \

Android.bp

@@ -7423,35 +7423,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libwifi-hal-mtk",
-    owner: "nothing",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libwifi-hal-mtk.so",
-            ],
-            shared_libs: [
-                "libbase",
-                "libcutils",
-                "liblog",
-                "libnl",
-                "libutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libwpfa",
     owner: "nothing",
@@ -23912,6 +23883,14 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
+sh_binary {
+    name: "chipinfo",
+    owner: "nothing",
+    src: "proprietary/vendor/bin/chipinfo",
+    filename: "chipinfo",
+    soc_specific: true,
+}
+
 cc_prebuilt_binary {
     name: "conninfra_loader",
     owner: "nothing",

proprietary/vendor/bin/chipinfo

@@ -0,0 +1,31 @@
+#!/vendor/bin/sh
+
+default_fact_prop=$(getprop ro.soc.manufacturer)
+
+if [ "$default_fact_prop" == "" ]; then
+	fact_val=$(cat /sys/devices/soc0/family)
+	/vendor/bin/setprop ro.vendor.soc.manufacturer ${fact_val}
+fi
+
+default_soc_prop=$(getprop ro.soc.model)
+
+if [ "$default_soc_prop" == "" ]; then
+	soc_val=$(cat /sys/devices/soc0/soc_id)
+	/vendor/bin/setprop ro.vendor.soc.model ${soc_val}
+else
+	soc_val="$default_soc_prop"
+fi
+
+soc_ext_val=$(cat /proc/device-tree/model-external-name 2>/dev/null)
+if [ -z "$soc_ext_val" ]; then
+	soc_ext_val=${soc_val}
+fi
+/vendor/bin/setprop ro.vendor.soc.model.external_name ${soc_ext_val}
+
+soc_part_val=$(cat /proc/device-tree/model-part-name 2>/dev/null)
+if [ -z "$soc_part_val" ]; then
+        soc_part_val=${soc_val}
+fi
+/vendor/bin/setprop ro.vendor.soc.model.part_name ${soc_part_val}
+
+/vendor/bin/setprop ro.vendor.soc.model_ready 1

proprietary/vendor/etc/init/chipinfo_init.rc

@@ -0,0 +1,7 @@
+on early-init
+    exec_background - system system -- /vendor/bin/chipinfo
+
+on post-fs-data
+    wait_for_prop ro.vendor.soc.model_ready 1
+    setprop ro.soc.model ${ro.vendor.soc.model}
+    setprop ro.soc.manufacturer ${ro.vendor.soc.manufacturer}