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

Commit 38a78e1f authored by Zhuoyao Zhang's avatar Zhuoyao Zhang Committed by Steven Moreland
Browse files

Static link test lib shims with test -impl libs. 

* So that vts no longer needs to push the shim libs in hidl test.

Bug: 67500459
Test: make vts
      vts-tradefed run vts -m VtsHidlUnitTest
Change-Id: I52ad066370f08a461b848d7d96dc4a659eb2da4d
parent dbdd8812

tests/bar/1.0/default/Android.bp

+7 −2
Original line number Diff line number Diff line 




cc_library_shared {

cc_library {

    name: "android.hardware.tests.bar@1.0-impl",

    defaults: ["hidl_defaults"],

    relative_install_path: "hw",
@@ -14,10 +14,15 @@ cc_library_shared { 
        "libcutils",

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

    ],



    // These are static libs only for testing purposes and portability. Shared

    // libs should be used on device.

    static_libs: [

        "android.hardware.tests.foo@1.0",

        "android.hardware.tests.bar@1.0",

    ],



}

tests/baz/1.0/default/Android.bp

+8 −2
Original line number Diff line number Diff line 
cc_library_shared {

cc_library {

    name: "android.hardware.tests.baz@1.0-impl",

    defaults: ["hidl_defaults"],

    relative_install_path: "hw",
@@ -7,9 +7,15 @@ cc_library_shared { 
    ],

    shared_libs: [

        "libbase",

        "libcutils",

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "android.hardware.tests.baz@1.0",

    ],



    // These are static libs only for testing purposes and portability. Shared

    // libs should be used on device.

    static_libs: ["android.hardware.tests.baz@1.0"],

}

tests/foo/1.0/default/Android.bp

+7 −3
Original line number Diff line number Diff line 




cc_library_shared {

cc_library {

    name: "android.hardware.tests.foo@1.0-impl",

    defaults: ["hidl_defaults"],

    relative_install_path: "hw",
@@ -11,12 +11,16 @@ cc_library_shared { 
    shared_libs: [

        "libbase",

        "libcutils",

        "libfootest",

        "libhidlbase",

        "libhidltransport",

        "libfootest",

        "libhwbinder",

        "liblog",

        "libutils",

        "android.hardware.tests.foo@1.0",

    ],



    // These are static libs only for testing purposes and portability. Shared

    // libs should be used on device.

    static_libs: ["android.hardware.tests.foo@1.0"],



}

tests/foo/1.0/default/lib/Android.bp

+6 −2
Original line number Diff line number Diff line 
cc_library_shared {

cc_library {

    name: "libfootest",

    defaults: ["hidl_defaults"],

    srcs: [
@@ -6,10 +6,14 @@ cc_library_shared { 
    ],



    shared_libs: [

        "libcutils",

        "libhidlbase",

        "libhidltransport",

        "android.hardware.tests.foo@1.0",

        "libhwbinder",

        "liblog",

    ],

    static_libs: ["android.hardware.tests.foo@1.0"],



    local_include_dirs: ["include/hidl-test"],

    export_include_dirs: ["include"],

tests/hash/1.0/default/Android.bp

+8 −2
Original line number Diff line number Diff line 
cc_library_shared {

cc_library {

    name: "android.hardware.tests.hash@1.0-impl",

    defaults: ["hidl_defaults"],

    relative_install_path: "hw",
@@ -6,9 +6,15 @@ cc_library_shared { 
        "Hash.cpp",

    ],

    shared_libs: [

        "libcutils",

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "android.hardware.tests.hash@1.0",

    ],



    // These are static libs only for testing purposes and portability. Shared

    // libs should be used on device.

    static_libs: ["android.hardware.tests.hash@1.0"],

}