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

Commit 10233e2f authored by Akilesh Kailash's avatar Akilesh Kailash
Browse files

snapuserd: Remove legacy dm-snapshot based snapshot and snapshot-merge 



Clean up all the legacy dm-snapshot based approach.

This will continue to maintain backward compatibility with vendor
partition on Android S.

Bug: 304829384
Test: OTA on Pixel
th - OTA from Android S to TOT with vendor on S
Change-Id: Id9263be881dd1a06923cd0ace007f1c027e6969d
Signed-off-by: default avatarAkilesh Kailash <akailash@google.com>
parent 25eabc44

fs_mgr/libsnapshot/Android.bp

+0 −18
Original line number Diff line number Diff line
@@ -321,24 +321,6 @@ cc_test { 
    },

}



cc_test {

    name: "vabc_legacy_tests",

    defaults: [

        "libsnapshot_test_defaults",

        "libsnapshot_hal_deps",

    ],

    cppflags: [

        "-DLIBSNAPSHOT_TEST_VABC_LEGACY",

    ],

    test_suites: [

        "device-tests",

    ],

    test_options: {

        // Legacy VABC launched in Android S.

        min_shipping_api_level: 31,

    },

}



cc_test {

    name: "vts_ota_config_test",

    srcs: [

fs_mgr/libsnapshot/snapshot_test.cpp

+3 −13
Original line number Diff line number Diff line
@@ -56,14 +56,12 @@ 


#if defined(LIBSNAPSHOT_TEST_VAB_LEGACY)

#define DEFAULT_MODE "vab-legacy"

#elif defined(LIBSNAPSHOT_TEST_VABC_LEGACY)

#define DEFAULT_MODE "vabc-legacy"

#else

#define DEFAULT_MODE ""

#endif



DEFINE_string(force_mode, DEFAULT_MODE,

              "Force testing older modes (vab-legacy, vabc-legacy) ignoring device config.");

              "Force testing older modes (vab-legacy) ignoring device config.");

DEFINE_string(force_iouring_disable, "",

              "Force testing mode (iouring_disabled) - disable io_uring");

DEFINE_string(compression_method, "gz", "Default compression algorithm.");
@@ -140,17 +138,10 @@ class SnapshotTest : public ::testing::Test { 
    void SetupProperties() {

        std::unordered_map<std::string, std::string> properties;



        ASSERT_TRUE(android::base::SetProperty("snapuserd.test.dm.snapshots", "0"))

                << "Failed to disable property: virtual_ab.userspace.snapshots.enabled";

        ASSERT_TRUE(android::base::SetProperty("snapuserd.test.io_uring.force_disable", "0"))

                << "Failed to set property: snapuserd.test.io_uring.disabled";



        if (FLAGS_force_mode == "vabc-legacy") {

            ASSERT_TRUE(android::base::SetProperty("snapuserd.test.dm.snapshots", "1"))

                    << "Failed to disable property: virtual_ab.userspace.snapshots.enabled";

            properties["ro.virtual_ab.compression.enabled"] = "true";

            properties["ro.virtual_ab.userspace.snapshots.enabled"] = "false";

        } else if (FLAGS_force_mode == "vab-legacy") {

        if (FLAGS_force_mode == "vab-legacy") {

            properties["ro.virtual_ab.compression.enabled"] = "false";

            properties["ro.virtual_ab.userspace.snapshots.enabled"] = "false";

        }
@@ -2894,7 +2885,7 @@ int main(int argc, char** argv) { 


    android::base::SetProperty("ctl.stop", "snapuserd");



    std::unordered_set<std::string> modes = {"", "vab-legacy", "vabc-legacy"};

    std::unordered_set<std::string> modes = {"", "vab-legacy"};

    if (modes.count(FLAGS_force_mode) == 0) {

        std::cerr << "Unexpected force_config argument\n";

        return 1;
@@ -2905,7 +2896,6 @@ int main(int argc, char** argv) { 


    int ret = RUN_ALL_TESTS();



    android::base::SetProperty("snapuserd.test.dm.snapshots", "0");

    android::base::SetProperty("snapuserd.test.io_uring.force_disable", "0");



    android::snapshot::KillSnapuserd();

fs_mgr/libsnapshot/snapuserd/Android.bp

+0 −43
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ cc_library_static { 
    ],

    local_include_dirs: ["include/"],

    srcs: [

        "dm-snapshot-merge/snapuserd.cpp",

        "dm-snapshot-merge/snapuserd_readahead.cpp",

        "dm-snapshot-merge/snapuserd_worker.cpp",

        "dm_user_block_server.cpp",

        "snapuserd_buffer.cpp",

        "user-space-merge/handler_manager.cpp",
@@ -109,7 +106,6 @@ cc_defaults { 
        "fs_mgr_defaults",

    ],

    srcs: [

        "dm-snapshot-merge/snapuserd_server.cpp",

        "snapuserd_daemon.cpp",

        "user-space-merge/snapuserd_server.cpp",

    ],
@@ -190,45 +186,6 @@ cc_binary { 
    symlinks: ["snapuserd"],

}



cc_test {

    name: "snapuserd_test_legacy",

    defaults: [

        "fs_mgr_defaults",

        "libsnapshot_cow_defaults",

    ],

    srcs: [

        "dm-snapshot-merge/cow_snapuserd_test.cpp",

        "dm-snapshot-merge/snapuserd.cpp",

        "dm-snapshot-merge/snapuserd_worker.cpp",

        "snapuserd_buffer.cpp",

    ],

    shared_libs: [

        "libbase",

        "liblog",

    ],

    static_libs: [

        "libbrotli",

        "libgtest",

        "libsnapshot_cow",

        "libsnapuserd_client",

        "libcutils_sockets",

        "libz",

        "libdm",

        "libext2_uuid",

        "libext4_utils",

        "libfs_mgr_file_wait",

    ],

    header_libs: [

        "libstorage_literals_headers",

        "libfiemap_headers",

    ],

    test_options: {

        min_shipping_api_level: 30,

    },

    auto_gen_config: true,

    require_root: false,

}



cc_defaults {

    name: "snapuserd_test_defaults",

    defaults: [

fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/cow_snapuserd_test.cpp

deleted100644 → 0
+0 −1238

File deleted.

Preview size limit exceeded, changes collapsed.

fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd.cpp

deleted100644 → 0
+0 −870

File deleted.

Preview size limit exceeded, changes collapsed.