Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit f4f6705e authored by andi34's avatar andi34 Committed by Michael Bestas
Browse files

updater: Allow devices to suppress BLKDISCARD 

* On some devices TRIM is disabled for security reasons. Don't fail
  flashing the ROM because discard isn't possible in this case.

Change-Id: I044619c3e0b01a496d967ef136501d0190240ad4
parent c07204fc

updater/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ ifneq ($(BOARD_RECOVERY_BLDRMSG_OFFSET),) 
    LOCAL_CFLAGS += -DBOARD_RECOVERY_BLDRMSG_OFFSET=$(BOARD_RECOVERY_BLDRMSG_OFFSET)

endif



ifeq ($(BOARD_SUPPRESS_EMMC_WIPE),true)

    LOCAL_CFLAGS += -DSUPPRESS_EMMC_WIPE

endif



LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS)

LOCAL_STATIC_LIBRARIES += libapplypatch libbase libotafault libedify libmtdutils libminzip libz

LOCAL_STATIC_LIBRARIES += libbz

updater/blockimg.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1334,10 +1334,12 @@ static int PerformCommandErase(CommandParameters& params) { 
            // length in bytes

            blocks[1] = (tgt.pos[i * 2 + 1] - tgt.pos[i * 2]) * (uint64_t) BLOCKSIZE;



#ifndef SUPPRESS_EMMC_WIPE

            if (ioctl(params.fd, BLKDISCARD, &blocks) == -1) {

                fprintf(stderr, "BLKDISCARD ioctl failed: %s\n", strerror(errno));

                return -1;

            }

#endif

        }

    }