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

Commit e6283117 authored by Akilesh Kailash's avatar Akilesh Kailash Committed by Automerger Merge Worker
Browse files

Merge "libsnapshot: compile tests for both 32 and 64 bit" into main am: 172f412b am: a78a77bf 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3236906



Change-Id: I32e5ac3c21978469a487da8353bfd9b70b7f9ed8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e23ac861 a78a77bf

fs_mgr/libsnapshot/Android.bp

+10 −1
Original line number Diff line number Diff line
@@ -285,7 +285,6 @@ cc_defaults { 
    ],

    auto_gen_config: true,

    require_root: true,

    compile_multilib: "first",

}



cc_test {
@@ -298,6 +297,15 @@ cc_test { 
        "vts",

        "general-tests",

    ],

    compile_multilib: "both",

    multilib: {

        lib32: {

            suffix: "32",

        },

        lib64: {

            suffix: "64",

        },

    },

    test_options: {

        min_shipping_api_level: 30,

    },
@@ -315,6 +323,7 @@ cc_test { 
    test_suites: [

        "general-tests",

    ],

    compile_multilib: "64",

    test_options: {

        // Legacy VAB launched in Android R.

        min_shipping_api_level: 30,

fs_mgr/libsnapshot/snapuserd/Android.bp

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

        min_shipping_api_level: 30,

    },



    compile_multilib: "both",

    multilib: {

        lib32: {

            suffix: "32",

        },

        lib64: {

            suffix: "64",

        },

    },



    auto_gen_config: true,

    require_root: true,

    compile_multilib: "first",

}



cc_test {