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

Commit ec93126c authored by Gabriel Biren's avatar Gabriel Biren Committed by Android (Google) Code Review
Browse files

Merge "Move shared Wifi VTS dependencies into a cc_defaults." into main

parents fd37eae0 7941612d

wifi/aidl/vts/functional/Android.bp

+16 −93
Original line number Diff line number Diff line
@@ -24,15 +24,12 @@ package { 
    default_applicable_licenses: ["hardware_interfaces_license"],

}



cc_test {

    name: "VtsHalWifiChipTargetTest",

cc_defaults {

    name: "wifi_vendor_hal_vts_test_defaults",

    defaults: [

        "VtsHalTargetTestDefaults",

        "use_libaidlvintf_gtest_helper_static",

    ],

    srcs: [

        "wifi_chip_aidl_test.cpp",

    ],

    shared_libs: [

        "libbinder",

        "libbinder_ndk",
@@ -50,108 +47,34 @@ cc_test { 
    ],

}



cc_test {

    name: "VtsHalWifiChipTargetTest",

    defaults: ["wifi_vendor_hal_vts_test_defaults"],

    srcs: ["wifi_chip_aidl_test.cpp"],

}



cc_test {

    name: "VtsHalWifiStaIfaceTargetTest",

    defaults: [

        "VtsHalTargetTestDefaults",

        "use_libaidlvintf_gtest_helper_static",

    ],

    srcs: [

        "wifi_sta_iface_aidl_test.cpp",

    ],

    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "libvndksupport",

    ],

    static_libs: [

        "VtsHalWifiTargetTestUtil",

        "android.hardware.wifi.common-V2-ndk",

        "android.hardware.wifi-V3-ndk",

        "libwifi-system-iface",

    ],

    test_suites: [

        "general-tests",

        "vts",

    ],

    defaults: ["wifi_vendor_hal_vts_test_defaults"],

    srcs: ["wifi_sta_iface_aidl_test.cpp"],

}



cc_test {

    name: "VtsHalWifiApIfaceTargetTest",

    defaults: [

        "VtsHalTargetTestDefaults",

        "use_libaidlvintf_gtest_helper_static",

    ],

    srcs: [

        "wifi_ap_iface_aidl_test.cpp",

    ],

    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "libvndksupport",

    ],

    static_libs: [

        "VtsHalWifiTargetTestUtil",

        "android.hardware.wifi.common-V2-ndk",

        "android.hardware.wifi-V3-ndk",

        "libwifi-system-iface",

    ],

    test_suites: [

        "general-tests",

        "vts",

    ],

    defaults: ["wifi_vendor_hal_vts_test_defaults"],

    srcs: ["wifi_ap_iface_aidl_test.cpp"],

}



cc_test {

    name: "VtsHalWifiNanIfaceTargetTest",

    defaults: [

        "VtsHalTargetTestDefaults",

        "use_libaidlvintf_gtest_helper_static",

    ],

    srcs: [

        "wifi_nan_iface_aidl_test.cpp",

    ],

    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "libvndksupport",

    ],

    static_libs: [

        "VtsHalWifiTargetTestUtil",

        "android.hardware.wifi.common-V2-ndk",

        "android.hardware.wifi-V3-ndk",

        "libwifi-system-iface",

    ],

    test_suites: [

        "general-tests",

        "vts",

    ],

    defaults: ["wifi_vendor_hal_vts_test_defaults"],

    srcs: ["wifi_nan_iface_aidl_test.cpp"],

}



cc_test {

    name: "VtsHalWifiRttControllerTargetTest",

    defaults: [

        "VtsHalTargetTestDefaults",

        "use_libaidlvintf_gtest_helper_static",

    ],

    srcs: [

        "wifi_rtt_controller_aidl_test.cpp",

    ],

    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "libvndksupport",

    ],

    static_libs: [

        "VtsHalWifiTargetTestUtil",

        "android.hardware.wifi.common-V2-ndk",

        "android.hardware.wifi-V3-ndk",

        "libwifi-system-iface",

    ],

    test_suites: [

        "general-tests",

        "vts",

    ],

    defaults: ["wifi_vendor_hal_vts_test_defaults"],

    srcs: ["wifi_rtt_controller_aidl_test.cpp"],

}



cc_library_static {

wifi/supplicant/aidl/vts/functional/Android.bp

+11 −102
Original line number Diff line number Diff line
@@ -24,13 +24,12 @@ package { 
    default_applicable_licenses: ["hardware_interfaces_license"],

}



cc_test {

    name: "VtsHalWifiSupplicantStaIfaceTargetTest",

cc_defaults {

    name: "supplicant_vts_test_defaults",

    defaults: [

        "VtsHalTargetTestDefaults",

        "use_libaidlvintf_gtest_helper_static",

    ],

    srcs: ["supplicant_sta_iface_aidl_test.cpp"],

    shared_libs: [

        "libbinder",

        "libbinder_ndk",
@@ -62,116 +61,26 @@ cc_test { 
    ],

}



cc_test {

    name: "VtsHalWifiSupplicantStaIfaceTargetTest",

    defaults: ["supplicant_vts_test_defaults"],

    srcs: ["supplicant_sta_iface_aidl_test.cpp"],

}



cc_test {

    name: "VtsHalWifiSupplicantStaNetworkTargetTest",

    defaults: [

        "VtsHalTargetTestDefaults",

        "use_libaidlvintf_gtest_helper_static",

    ],

    defaults: ["supplicant_vts_test_defaults"],

    srcs: ["supplicant_sta_network_aidl_test.cpp"],

    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "libvndksupport",

    ],

    static_libs: [

        "android.hardware.wifi@1.0",

        "android.hardware.wifi@1.1",

        "android.hardware.wifi@1.2",

        "android.hardware.wifi@1.3",

        "android.hardware.wifi@1.4",

        "android.hardware.wifi@1.5",

        "android.hardware.wifi.common-V2-ndk",

        "android.hardware.wifi.supplicant@1.0",

        "android.hardware.wifi.supplicant@1.1",

        "android.hardware.wifi.supplicant-V4-ndk",

        "libwifi-system",

        "libwifi-system-iface",

        "VtsHalWifiV1_0TargetTestUtil",

        "VtsHalWifiV1_5TargetTestUtil",

        "VtsHalWifiSupplicantV1_0TargetTestUtil",

        "android.hardware.wifi.common-V2-ndk",

        "android.hardware.wifi-V3-ndk",

        "VtsHalWifiTargetTestUtil",

    ],

    test_suites: [

        "general-tests",

        "vts",

    ],

}



cc_test {

    name: "VtsHalWifiSupplicantP2pIfaceTargetTest",

    defaults: [

        "VtsHalTargetTestDefaults",

        "use_libaidlvintf_gtest_helper_static",

    ],

    defaults: ["supplicant_vts_test_defaults"],

    srcs: ["supplicant_p2p_iface_aidl_test.cpp"],

    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "libvndksupport",

    ],

    static_libs: [

        "android.hardware.wifi@1.0",

        "android.hardware.wifi@1.1",

        "android.hardware.wifi@1.2",

        "android.hardware.wifi@1.3",

        "android.hardware.wifi@1.4",

        "android.hardware.wifi@1.5",

        "android.hardware.wifi.common-V2-ndk",

        "android.hardware.wifi.supplicant@1.0",

        "android.hardware.wifi.supplicant@1.1",

        "android.hardware.wifi.supplicant-V4-ndk",

        "libwifi-system",

        "libwifi-system-iface",

        "VtsHalWifiV1_0TargetTestUtil",

        "VtsHalWifiV1_5TargetTestUtil",

        "VtsHalWifiSupplicantV1_0TargetTestUtil",

        "android.hardware.wifi.common-V2-ndk",

        "android.hardware.wifi-V3-ndk",

        "VtsHalWifiTargetTestUtil",

    ],

    test_suites: [

        "general-tests",

        "vts",

    ],

}



cc_test {

    name: "VtsHalWifiSupplicantP2pNetworkTargetTest",

    defaults: [

        "VtsHalTargetTestDefaults",

        "use_libaidlvintf_gtest_helper_static",

    ],

    defaults: ["supplicant_vts_test_defaults"],

    srcs: ["supplicant_p2p_network_aidl_test.cpp"],

    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "libvndksupport",

    ],

    static_libs: [

        "android.hardware.wifi@1.0",

        "android.hardware.wifi@1.1",

        "android.hardware.wifi@1.2",

        "android.hardware.wifi@1.3",

        "android.hardware.wifi@1.4",

        "android.hardware.wifi@1.5",

        "android.hardware.wifi.common-V2-ndk",

        "android.hardware.wifi.supplicant@1.0",

        "android.hardware.wifi.supplicant@1.1",

        "android.hardware.wifi.supplicant-V4-ndk",

        "libwifi-system",

        "libwifi-system-iface",

        "VtsHalWifiV1_0TargetTestUtil",

        "VtsHalWifiV1_5TargetTestUtil",

        "VtsHalWifiSupplicantV1_0TargetTestUtil",

        "android.hardware.wifi.common-V2-ndk",

        "android.hardware.wifi-V3-ndk",

        "VtsHalWifiTargetTestUtil",

    ],

    test_suites: [

        "general-tests",

        "vts",

    ],

}