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

Commit bcc8f940 authored by Frederick Mayle's avatar Frederick Mayle
Browse files

init: skip SnapshotManager steps for microdroid variant 

`IsMicrodroid()` is a compile time constant, so this allows all of the
SnapshotManager code to be elimated at compile time, which transitively
includes some big libraries, like zstd, lz4, and brotli.

When checked with the following command, the binary size goes from
3,299,754 to 1,510,044 (-55%).

size -A out/soong/.intermediates/system/core/init/init_second_stage.microdroid/android_arm64_armv8-2a_cortex-a55/init

Test: launch microdroid
Flag: EXEMPT ...
Change-Id: Id747ac37de80e23df9b7939f9bb82d0237beb4fa
parent 3c483b4a

init/first_stage_mount.cpp

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ bool FirstStageMountVBootV2::CreateLogicalPartitions() { 
        return false;

    }



    if (SnapshotManager::IsSnapshotManagerNeeded()) {

    if (!IsMicrodroid() && SnapshotManager::IsSnapshotManagerNeeded()) {

        auto init_devices = [this](const std::string& device) -> bool {

            if (android::base::StartsWith(device, "/dev/block/dm-")) {

                return block_dev_init_.InitDmDevice(device);

init/reboot.cpp

+8 −6
Original line number Diff line number Diff line
@@ -445,8 +445,9 @@ static UmountStat TryUmountAndFsck(unsigned int cmd, bool run_fsck, 
    if (run_fsck && !FindPartitionsToUmount(&block_devices, &emulated_devices, false)) {

        return UMOUNT_STAT_ERROR;

    }

    auto sm = snapshot::SnapshotManager::New();

    bool ota_update_in_progress = false;

    if (!IsMicrodroid()) {

        auto sm = snapshot::SnapshotManager::New();

        if (sm->IsUserspaceSnapshotUpdateInProgress(dynamic_partitions)) {

            LOG(INFO) << "OTA update in progress. Pause snapshot merge";

            if (!sm->PauseSnapshotMerge()) {
@@ -454,6 +455,7 @@ static UmountStat TryUmountAndFsck(unsigned int cmd, bool run_fsck, 
            }

            ota_update_in_progress = true;

        }

    }

    UmountStat stat = UmountPartitions(timeout - t.duration());

    if (stat != UMOUNT_STAT_SUCCESS) {

        LOG(INFO) << "umount timeout, last resort, kill all and try";