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

Commit 91ffe19c authored by Yifan Hong's avatar Yifan Hong
Browse files

snapshotctl don't auto-merge. 

update_engine is now responsible for initiating the merge. snapshotctl
becomes a debugging tool for libsnapshot now.

Bug: 147696014
Test: libsnapshot_test

Change-Id: Ia2527a35e0c0f0789dbe5c477e174663ef406903
Merged-In: Ia2527a35e0c0f0789dbe5c477e174663ef406903
parent c6411c2d

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -90,3 +90,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/product_services) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/debug_ramdisk/product_services)

$(call add-clean-step, find $(PRODUCT_OUT) -type l -name "charger" -print0 | xargs -0 rm -f)

$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/bin/adbd)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/snapshotctl.rc)

fs_mgr/libsnapshot/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -235,7 +235,4 @@ cc_binary { 
        // TODO(b/148818798): remove when parent bug is fixed.

        "libutilscallstack",

    ],

    init_rc: [

        "snapshotctl.rc",

    ],

}

fs_mgr/libsnapshot/snapshotctl.cpp

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ bool MergeCmdHandler(int argc, char** argv) { 
    }



    LOG(ERROR) << "Snapshot failed to merge with state \"" << state << "\".";



    return false;

}

fs_mgr/libsnapshot/snapshotctl.rc

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
on property:sys.boot_completed=1

    exec_background - root root -- /system/bin/snapshotctl merge --logcat --log-to-file --report