From f683030ca503843c0298a1aca16e231936589112 Mon Sep 17 00:00:00 2001
From: Mashopy <eliasgheeraert@gmail.com>
Date: Wed, 8 Jul 2026 16:31:44 +0200
Subject: [PATCH] Aerodactyl: Switch to hardware/mediatek chipinfo script

---
 Aerodactyl-vendor.mk                         |  2 --
 Android.bp                                   |  8 -----
 proprietary/vendor/bin/chipinfo              | 31 --------------------
 proprietary/vendor/etc/init/chipinfo_init.rc |  7 -----
 4 files changed, 48 deletions(-)
 delete mode 100755 proprietary/vendor/bin/chipinfo
 delete mode 100644 proprietary/vendor/etc/init/chipinfo_init.rc

diff --git a/Aerodactyl-vendor.mk b/Aerodactyl-vendor.mk
index 337f1ce..befc1ac 100644
--- a/Aerodactyl-vendor.mk
+++ b/Aerodactyl-vendor.mk
@@ -238,7 +238,6 @@ 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 \
@@ -1155,7 +1154,6 @@ PRODUCT_PACKAGES += \
     bip_ap \
     ccci_mdinit \
     ccci_rpcd \
-    chipinfo \
     conninfra_loader \
     fuelgauged \
     fuelgauged_nvram \
diff --git a/Android.bp b/Android.bp
index 981e88f..987a0e7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23972,14 +23972,6 @@ 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",
diff --git a/proprietary/vendor/bin/chipinfo b/proprietary/vendor/bin/chipinfo
deleted file mode 100755
index 914e7e3..0000000
--- a/proprietary/vendor/bin/chipinfo
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/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
diff --git a/proprietary/vendor/etc/init/chipinfo_init.rc b/proprietary/vendor/etc/init/chipinfo_init.rc
deleted file mode 100644
index 708c1ef..0000000
--- a/proprietary/vendor/etc/init/chipinfo_init.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-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}
\ No newline at end of file