From 6541c56692f6c3eeb4e04aef2a40d46014bd1fd4 Mon Sep 17 00:00:00 2001 From: Ido Date: Sat, 26 Sep 2026 10:45:11 +0200 Subject: [PATCH] rodin: Switch to source-built chipinfo init script Change-Id: Ia9d097d34acd80be71d32184847f35f3b2e2b0dc Signed-off-by: Ido --- Android.bp | 8 ----- proprietary/vendor/bin/chipinfo | 31 -------------------- proprietary/vendor/etc/init/chipinfo_init.rc | 7 ----- rodin-vendor.mk | 2 -- 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/Android.bp b/Android.bp index 30e2f3c..3bb83be 100644 --- a/Android.bp +++ b/Android.bp @@ -36072,14 +36072,6 @@ cc_prebuilt_binary { soc_specific: true, } -sh_binary { - name: "chipinfo", - owner: "xiaomi", - src: "proprietary/vendor/bin/chipinfo", - filename: "chipinfo", - soc_specific: true, -} - cc_prebuilt_binary { name: "conninfra_loader", owner: "xiaomi", diff --git a/proprietary/vendor/bin/chipinfo b/proprietary/vendor/bin/chipinfo deleted file mode 100755 index 2e91a1e..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 diff --git a/rodin-vendor.mk b/rodin-vendor.mk index 70434b7..ff2a5cd 100644 --- a/rodin-vendor.mk +++ b/rodin-vendor.mk @@ -535,7 +535,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.tetheroffload-V1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.tetheroffload-V1-service.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/arm.mali.platform-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/arm.mali.platform-mediatek.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/camerahalserver.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/camerahalserver.rc \ - vendor/xiaomi/rodin/proprietary/vendor/etc/init/chipinfo_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/chipinfo_init.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/dms-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dms-service.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/fuelgauged_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_init.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/fuelgauged_nvram_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_nvram_init.rc \ @@ -1958,7 +1957,6 @@ PRODUCT_PACKAGES += \ cameratest \ ccci_mdinit \ ccci_rpcd \ - chipinfo \ conninfra_loader \ displayfeature \ fuelgauged \