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

Commit 6c2bd86f authored by Tri Vo's avatar Tri Vo
Browse files

VTS tests now static link to HAL def libs. 

And use VtsHalTargetTestDefaults.

Bug: 64040096
Test: compiles
Change-Id: I3cfb1a64f6abcf3145337a736800b72d92a0b152
parent 0b19836c

bluetooth/1.0/vts/functional/Android.bp

+2 −16
Original line number Diff line number Diff line
@@ -16,24 +16,10 @@ 


cc_test {

    name: "VtsHalBluetoothV1_0TargetTest",

    defaults: ["hidl_defaults"],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["VtsHalBluetoothV1_0TargetTest.cpp"],

    shared_libs: [

        "libbase",

        "liblog",

        "libcutils",

        "libhidlbase",

        "libhidltransport",

        "libnativehelper",

        "libutils",

        "android.hardware.bluetooth@1.0",

    ],

    static_libs: [

        "VtsHalHidlTargetTestBase",

        "android.hardware.bluetooth@1.0",

        "libbluetooth-types",

    ],

    cflags: [

        "-O0",

        "-g",

    ],

}

ir/1.0/vts/functional/Android.bp

+2 −13
Original line number Diff line number Diff line
@@ -16,20 +16,9 @@ 


cc_test {

    name: "VtsHalIrV1_0TargetTest",

    defaults: ["hidl_defaults"],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["VtsHalIrV1_0TargetTest.cpp"],

    shared_libs: [

        "libbase",

        "liblog",

        "libcutils",

        "libhidlbase",

        "libhidltransport",

        "libutils",

    static_libs: [

        "android.hardware.ir@1.0",

    ],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",

    ],

}

nfc/1.0/vts/functional/Android.bp

+2 −14
Original line number Diff line number Diff line
@@ -16,21 +16,9 @@ 


cc_test {

    name: "VtsHalNfcV1_0TargetTest",

    defaults: ["hidl_defaults"],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["VtsHalNfcV1_0TargetTest.cpp"],

    shared_libs: [

        "libbase",

        "liblog",

        "libcutils",

        "libhidlbase",

        "libhidltransport",

        "libnativehelper",

        "libutils",

    static_libs: [

        "android.hardware.nfc@1.0",

    ],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",

    ],

}

radio/1.0/vts/functional/Android.bp

+5 −29
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


cc_test {

    name: "VtsHalRadioV1_0TargetTest",

    defaults: ["hidl_defaults"],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["radio_hidl_hal_cell_broadcast.cpp",

           "radio_hidl_hal_data.cpp",

           "radio_hidl_hal_icc.cpp",
@@ -30,46 +30,22 @@ cc_test { 
           "radio_response.cpp",

           "VtsHalRadioV1_0TargetTest.cpp",

           "vts_test_util.cpp"],

    shared_libs: [

        "libbase",

        "liblog",

        "libcutils",

        "libhidlbase",

        "libhidltransport",

        "libnativehelper",

        "libutils",

    static_libs: [

        "android.hardware.radio@1.0",

    ],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",

    ],

}



cc_test {

    name: "VtsHalSapV1_0TargetTest",

    defaults: ["hidl_defaults"],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["sap_callback.cpp",

           "sap_hidl_hal_api.cpp",

           "sap_hidl_hal_test.cpp",

           "VtsHalSapV1_0TargetTest.cpp",

           "vts_test_util.cpp"],

    shared_libs: [

        "libbase",

        "liblog",

        "libcutils",

        "libhidlbase",

        "libhidltransport",

        "libnativehelper",

        "libutils",

    static_libs: [

        "android.hardware.radio@1.0",

    ],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",

    ],

}



cc_library_static {

radio/1.1/vts/functional/Android.bp

+3 −15
Original line number Diff line number Diff line
@@ -16,31 +16,19 @@ 


cc_test {

    name: "VtsHalRadioV1_1TargetTest",

    defaults: ["hidl_defaults"],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["radio_hidl_hal_api.cpp",

           "radio_hidl_hal_test.cpp",

           "radio_indication.cpp",

           "radio_response.cpp",

           "VtsHalRadioV1_1TargetTest.cpp"],

    shared_libs: [

        "libbase",

        "liblog",

        "libcutils",

        "libhidlbase",

        "libhidltransport",

        "libnativehelper",

        "libutils",

    static_libs: [

        "RadioVtsTestUtilBase",

        "android.hardware.radio@1.1",

        "android.hardware.radio@1.0",

    ],

    static_libs: ["VtsHalHidlTargetTestBase",

                  "RadioVtsTestUtilBase"],

    header_libs: [

        "radio.util.header@1.0",

    ],

    cflags: [

        "-O0",

        "-g",

    ],

}