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

Commit 873ae91b authored by Akilesh Kailash's avatar Akilesh Kailash Committed by Gerrit Code Review
Browse files

Revert "libsnapshot: compile tests for both 32 and 64 bit" 

This reverts commit 2317bbad.

Reason for revert: b/358254699

Change-Id: Icb9dc0d48f3e39a45a69f9aa36f9bfe46d27e37a
parent 2317bbad

fs_mgr/libsnapshot/Android.bp

+7 −9
Original line number Original line Diff line number Diff line
@@ -281,17 +281,9 @@ cc_defaults { 
    header_libs: [

    header_libs: [

        "libstorage_literals_headers",

        "libstorage_literals_headers",

    ],

    ],

    compile_multilib: "both",

    multilib: {

        lib32: {

            suffix: "32",

        },

        lib64: {

            suffix: "64",

        },

    },

    auto_gen_config: true,

    auto_gen_config: true,

    require_root: true,

    require_root: true,

    compile_multilib: "first",

}

}





cc_test {

cc_test {
@@ -324,6 +316,12 @@ cc_test { 
    test_options: {

    test_options: {

        // Legacy VAB launched in Android R.

        // Legacy VAB launched in Android R.

        min_shipping_api_level: 30,

        min_shipping_api_level: 30,

        test_runner_options: [

            {

                name: "force-no-test-error",

                value: "false",

            },

        ],

    },

    },

}

}

fs_mgr/libsnapshot/snapuserd/Android.bp

+1 −11
Original line number Original line Diff line number Diff line
@@ -238,19 +238,9 @@ cc_defaults { 
    test_options: {

    test_options: {

        min_shipping_api_level: 30,

        min_shipping_api_level: 30,

    },

    },



    compile_multilib: "both",

    multilib: {

        lib32: {

            suffix: "32",

        },

        lib64: {

            suffix: "64",

        },

    },



    auto_gen_config: true,

    auto_gen_config: true,

    require_root: true,

    require_root: true,

    compile_multilib: "first",

}

}





cc_test {

cc_test {