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

Commit f828bd26 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Support AIDL IAllocator for direct channel tests" into tm-dev

parents 8c1586bc c3253373

sensors/1.0/vts/functional/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -26,7 +26,10 @@ package { 
cc_test {

    name: "VtsHalSensorsV1_0TargetTest",

    cflags: ["-DLOG_TAG=\"sensors_hidl_hal_test\""],

    defaults: ["VtsHalTargetTestDefaults"],

    defaults: [

        "VtsHalSensorsDefaults",

        "VtsHalTargetTestDefaults",

    ],

    tidy_timeout_srcs: [

        "VtsHalSensorsV1_0TargetTest.cpp",

    ],
@@ -34,9 +37,12 @@ cc_test { 
        "SensorsHidlEnvironmentV1_0.cpp",

        "VtsHalSensorsV1_0TargetTest.cpp",

    ],

    shared_libs: [

        "libbinder_ndk",

        "libvndksupport",

    ],

    static_libs: [

        "android.hardware.sensors@1.0",

        "VtsHalSensorsTargetTestUtils",

    ],

    test_suites: [

        "general-tests",

sensors/2.0/vts/functional/Android.bp

+7 −2
Original line number Diff line number Diff line
@@ -26,7 +26,10 @@ package { 
cc_test {

    name: "VtsHalSensorsV2_0TargetTest",

    cflags: ["-DLOG_TAG=\"sensors_hidl_hal_test\""],

    defaults: ["VtsHalTargetTestDefaults"],

    defaults: [

        "VtsHalSensorsDefaults",

        "VtsHalTargetTestDefaults",

    ],

    tidy_timeout_srcs: [

        "VtsHalSensorsV2_0TargetTest.cpp",

    ],
@@ -36,13 +39,15 @@ cc_test { 
    header_libs: [

        "android.hardware.sensors@2.X-shared-utils",

    ],

    shared_libs: [

        "libbinder_ndk",

    ],

    static_libs: [

        "android.hardware.sensors@1.0",

        "android.hardware.sensors@1.0-convert",

        "android.hardware.sensors@2.0",

        "android.hardware.sensors@2.1",

        "libfmq",

        "VtsHalSensorsTargetTestUtils",

        "VtsHalSensorsV2_0TargetTest-lib",

    ],

    test_suites: [

sensors/2.1/vts/functional/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -28,7 +28,10 @@ cc_test { 
    cflags: [

        "-DLOG_TAG=\"sensors_hidl_hal_test\"",

    ],

    defaults: ["VtsHalTargetTestDefaults"],

    defaults: [

        "VtsHalSensorsDefaults",

        "VtsHalTargetTestDefaults",

    ],

    srcs: [

        "VtsHalSensorsV2_1TargetTest.cpp",

    ],
@@ -41,7 +44,6 @@ cc_test { 
        "android.hardware.sensors@2.0",

        "android.hardware.sensors@2.1",

        "libfmq",

        "VtsHalSensorsTargetTestUtils",

        "VtsHalSensorsV2_1TargetTest-lib",

    ],

    test_suites: [

sensors/aidl/vts/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -24,8 +24,9 @@ package { 
cc_test {

    name: "VtsAidlHalSensorsTargetTest",

    defaults: [

        "VtsHalTargetTestDefaults",

        "use_libaidlvintf_gtest_helper_static",

        "VtsHalSensorsDefaults",

        "VtsHalTargetTestDefaults",

    ],

    srcs: [

        "VtsAidlHalSensorsTargetTest.cpp",

sensors/common/vts/utils/Android.bp

+23 −0
Original line number Diff line number Diff line
@@ -23,6 +23,23 @@ package { 
    default_applicable_licenses: ["hardware_interfaces_license"],

}



// Prefer to use these defaults to pull in VtsHalSensorsTargetTestUtils + its

// dependencies

cc_defaults {

    name: "VtsHalSensorsDefaults",

    shared_libs: [

        "android.hardware.graphics.allocator-V1-ndk",

        "android.hardware.graphics.common-V3-ndk",

        "libbinder_ndk",

        "libutils",

        "libvndksupport",

    ],

    static_libs: [

        "libaidlcommonsupport",

        "VtsHalSensorsTargetTestUtils",

    ],

}



cc_library_static {

    name: "VtsHalSensorsTargetTestUtils",

    defaults: ["VtsHalTargetTestDefaults"],
@@ -36,13 +53,19 @@ cc_library_static { 
    local_include_dirs: [

        "include/sensors-vts-utils",

    ],

    // Targets that depend on us need to also include these

    shared_libs: [

        "android.hardware.graphics.allocator-V1-ndk",

        "android.hardware.graphics.common-V3-ndk",

        "libbinder_ndk",

        "libutils",

        "libvndksupport",

    ],

    static_libs: [

        "android.hardware.sensors@1.0",

        "android.hardware.sensors@2.0",

        "android.hardware.sensors@2.1",

        "libaidlcommonsupport",

    ],

    whole_static_libs: [

        "android.hardware.graphics.allocator@2.0",