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

Commit 0c2ce357 authored by Tri Vo's avatar Tri Vo
Browse files

VTS tests now static link to HAL def libs. #2 

And use VtsHalTargetTestDefaults.

Bug: 64040096
Test: crop out all non-affected tests from vts-hal-hidl.xml and run
vts-tradefed run commandAndExit vts-hal-hidl --skip-all-system-status-check 
--skip-preconditions
2 failures, same as without this change:
GatekeeperHidlTest.DeleteAllUsersTest
GatekeeperHidlTest.DeleteUserTest

Change-Id: I8f6995e9536a9aefe283ee3effec9f5a7f03b620
parent cc1007af

biometrics/fingerprint/2.1/vts/functional/Android.bp

+2 −15
Original line number Diff line number Diff line
@@ -16,21 +16,8 @@ 


cc_test {

    name: "VtsHalBiometricsFingerprintV2_1TargetTest",

    defaults: ["hidl_defaults"],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["VtsHalBiometricsFingerprintV2_1TargetTest.cpp"],

    shared_libs: [

        "libbase",

        "libhidltransport",

        "libhardware",

        "libhidlbase",

        "liblog",

        "libutils",

        "android.hardware.biometrics.fingerprint@2.1",

    ],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",

    ]

    static_libs: ["android.hardware.biometrics.fingerprint@2.1"],

}

boot/1.0/vts/functional/Android.bp

+2 −15
Original line number Diff line number Diff line
@@ -16,20 +16,7 @@ 


cc_test {

    name: "VtsHalBootV1_0TargetTest",

    defaults: ["hidl_defaults"],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["VtsHalBootV1_0TargetTest.cpp"],

    shared_libs: [

        "libbase",

        "liblog",

        "libcutils",

        "libhidlbase",

        "libnativehelper",

        "libutils",

        "android.hardware.boot@1.0",

    ],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",

    ]

    static_libs: ["android.hardware.boot@1.0"],

}

broadcastradio/1.0/vts/functional/Android.bp

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


cc_test {

    name: "VtsHalBroadcastradioV1_0TargetTest",

    defaults: ["hidl_defaults"],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["VtsHalBroadcastradioV1_0TargetTest.cpp"],

    shared_libs: [

        "libbase",

        "liblog",

        "libcutils",

        "libhidlbase",

        "libhidltransport",

        "libnativehelper",

        "libutils",

        "android.hardware.broadcastradio@1.0",

    ],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",

    ],

    static_libs: ["android.hardware.broadcastradio@1.0"],

}

broadcastradio/1.1/vts/functional/Android.bp

+2 −17
Original line number Diff line number Diff line
@@ -16,28 +16,13 @@ 


cc_test {

    name: "VtsHalBroadcastradioV1_1TargetTest",

    defaults: ["hidl_defaults"],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["VtsHalBroadcastradioV1_1TargetTest.cpp"],

    shared_libs: [

        "libbase",

        "liblog",

        "libcutils",

        "libhidlbase",

        "libhidltransport",

        "libnativehelper",

        "libutils",

    static_libs: [

        "android.hardware.broadcastradio@1.0",

        "android.hardware.broadcastradio@1.1",

    ],

    static_libs: [

        "VtsHalHidlTargetTestBase",

        "android.hardware.broadcastradio@1.1-utils-lib",

        "android.hardware.broadcastradio@1.1-vts-utils-lib",

        "libgmock",

    ],

    cflags: [

        "-Wextra",

        "-O0",

        "-g",

    ],

}

configstore/1.0/vts/functional/Android.bp

+2 −13
Original line number Diff line number Diff line
@@ -16,19 +16,8 @@ 


cc_test {

    name: "VtsHalConfigstoreV1_0TargetTest",

    defaults: ["hidl_defaults"],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["VtsHalConfigstoreV1_0TargetTest.cpp"],

    shared_libs: [

        "libbase",

        "libhidlbase",

        "liblog",

        "libutils",

        "android.hardware.configstore@1.0",

    ],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",

    ]

    static_libs: ["android.hardware.configstore@1.0"],

}