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

Commit eb8942b3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder/libbinder_ndk stability tests in VTS" am: 7b11a38c am:... 

Merge "libbinder/libbinder_ndk stability tests in VTS" am: 7b11a38c am: 1eab4925 am: 3dbed327 am: 3d4f1b22 am: 8f71c7d6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1371802

Change-Id: I0a924d1e5814e1e3b6bde530b7bf39d6eef2f464
parents 6db8d6e9 8f71c7d6

libs/binder/ndk/tests/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ cc_library_static { 
cc_defaults {

    name: "test_libbinder_ndk_test_defaults",

    defaults: ["test_libbinder_ndk_defaults"],

    // critical that libbinder/libbinder_ndk are shared for VTS

    shared_libs: [

        "libandroid_runtime_lazy",

        "libbase",
@@ -63,7 +64,7 @@ cc_test { 
        "IBinderNdkUnitTest-cpp",

        "IBinderNdkUnitTest-ndk_platform",

    ],

    test_suites: ["general-tests"],

    test_suites: ["general-tests", "vts"],

    require_root: true,



    // force since binderVendorDoubleLoadTest has its own
@@ -81,13 +82,14 @@ cc_test { 
        "IBinderVendorDoubleLoadTest-ndk_platform",

        "libbinder_aidl_test_stub-ndk_platform",

    ],

    // critical that libbinder/libbinder_ndk are shared for VTS

    shared_libs: [

        "libbase",

        "libbinder",

        "libbinder_ndk",

        "libutils",

    ],

    test_suites: ["general-tests"],

    test_suites: ["general-tests", "vts"],

}



aidl_interface {

libs/binder/tests/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ cc_test { 
        "binderStabilityTest.cpp",

    ],



    // critical that libbinder/libbinder_ndk are shared for VTS

    shared_libs: [

        "libbinder_ndk",

        "libbinder",
@@ -166,7 +167,7 @@ cc_test { 
        "binderStabilityTestIface-ndk_platform",

    ],



    test_suites: ["device-tests"],

    test_suites: ["device-tests", "vts"],

    require_root: true,

}