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

Commit 83019575 authored by Steve Muckle's avatar Steve Muckle
Browse files

VtsKernelLiblpTest: use static test 

To avoid introducing dependencies on target libraries, use a statically
compiled test instead.

Bug: 134912860
Test: run vts-kernel -m VtsKernelLiblpTest
Change-Id: Ie24cc8532c7821cb225c024c240c4d485557bfa7
parent 69880e1a

fs_mgr/liblp/Android.bp

+22 −16
Original line number Diff line number Diff line
@@ -14,6 +14,16 @@ 
// limitations under the License.

//



liblp_lib_deps = [

    "libbase",

    "liblog",

    "libcrypto",

    "libcrypto_utils",

    "libsparse",

    "libext4_utils",

    "libz",

]



cc_library {

    name: "liblp",

    host_supported: true,
@@ -30,15 +40,7 @@ cc_library { 
        "utility.cpp",

        "writer.cpp",

    ],

    shared_libs: [

        "libbase",

        "liblog",

        "libcrypto",

        "libcrypto_utils",

        "libsparse",

        "libext4_utils",

        "libz",

    ],

    shared_libs: liblp_lib_deps,

    target: {

        windows: {

            enabled: true,
@@ -53,24 +55,28 @@ cc_library { 
}



cc_test {

    name: "liblp_test",

    name: "liblp_test_static",

    defaults: ["fs_mgr_defaults"],

    cppflags: [

        "-Wno-unused-parameter",

    ],

    static_libs: [

        "libgmock",

    ],

    shared_libs: [

        "liblp",

        "libbase",

        "libfs_mgr",

        "libsparse",

    ],

        "liblp",

    ] + liblp_lib_deps,

    stl: "libc++_static",

    srcs: [

        "builder_test.cpp",

        "io_test.cpp",

        "test_partition_opener.cpp",

        "utility_test.cpp",

    ],

    target: {

        android: {

            static_libs: [

                "libcutils",

            ],

        },

    },

}

fs_mgr/liblp/AndroidTest.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
    </target_preparer>

    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">

      <option name="test-module-name" value="VtsKernelLiblpTest"/>

        <option name="binary-test-source" value="_32bit::DATA/nativetest/liblp_test/liblp_test" />

        <option name="binary-test-source" value="_64bit::DATA/nativetest64/liblp_test/liblp_test" />

        <option name="binary-test-source" value="_32bit::DATA/nativetest/liblp_test_static/liblp_test_static" />

        <option name="binary-test-source" value="_64bit::DATA/nativetest64/liblp_test_static/liblp_test_static" />

        <option name="binary-test-type" value="gtest"/>

        <option name="test-timeout" value="1m"/>

        <option name="precondition-first-api-level" value="29" />