mi8937: blksetro: Rename module to avoid build conflict

mi-msm8937 · Jul 29, 2022 · f4416af · f4416af
1 parent ec1de62
commit f4416af
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/blkroset/Android.bp b/blkroset/Android.bp
@@ -1,5 +1,5 @@
 cc_binary {
-    name: "blkroset",
+    name: "blkroset.mi8937",
     recovery: true,
     srcs: ["blkroset.c"],
     cflags: [

diff --git a/device.mk b/device.mk
@@ -40,6 +40,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Utils
 PRODUCT_PACKAGES += \
-    blkroset
+    blkroset.mi8937
 
 $(call inherit-product-if-exists, vendor/extras/product.mk)
diff --git a/recovery/root/init.recovery.qcom.rc b/recovery/root/init.recovery.qcom.rc
@@ -33,4 +33,4 @@ on boot
 
 on boot
     start protect-partitions
-    exec u:r:recovery:s0 -- /system/bin/blkroset /dev/block/mmcblk0
+    exec u:r:recovery:s0 -- /system/bin/blkroset.mi8937 /dev/block/mmcblk0
diff --git a/recovery/root/system/bin/protect-partitions.sh b/recovery/root/system/bin/protect-partitions.sh
@@ -10,7 +10,7 @@ PROTECTED_PARTITIONS="$(ls /dev/block/platform/soc/${BOOTDEVICE}/by-name/|eval g
 # Make protected partitions read-only
 log "Protected partitions: " $PROTECTED_PARTITIONS
 for p in $PROTECTED_PARTITIONS; do
-    blkroset /dev/block/platform/soc/${BOOTDEVICE}/by-name/${p} || true
+    blkroset.mi8937 /dev/block/platform/soc/${BOOTDEVICE}/by-name/${p} || true
 done
 
 exit 0