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

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

Merge changes from topic "switch-to-aidl-vendor-hal" 

* changes:
  Update VTS test dependencies.
  Update Vendor HAL APEX to use the AIDL service.
parents 8d8f24f7 bd150ea1

wifi/aidl/vts/functional/wifi_aidl_test_utils.cpp

+4 −0
Original line number Diff line number Diff line
@@ -214,3 +214,7 @@ int32_t getChipCapabilities(const std::shared_ptr<IWifiChip>& wifi_chip) { 
    }

    return 0;

}



bool isAidlServiceAvailable(const char* instance_name) {

    return AServiceManager_isDeclared(instance_name);

}

wifi/aidl/vts/functional/wifi_aidl_test_utils.h

+1 −0
Original line number Diff line number Diff line
@@ -46,3 +46,4 @@ bool configureChipToSupportConcurrencyType(const std::shared_ptr<IWifiChip>& wif 
void stopWifiService(const char* instance_name);

int32_t getChipCapabilities(const std::shared_ptr<IWifiChip>& wifi_chip);

bool checkStatusCode(ndk::ScopedAStatus* status, WifiStatusCode expected_code);

bool isAidlServiceAvailable(const char* instance_name);

wifi/apex/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ android_app_certificate { 


genrule {

    name: "gen-android.hardware.wifi.rc",

    srcs: [":default-android.hardware.wifi@1.0-service.rc"],

    srcs: [":default-android.hardware.wifi-service.rc"],

    out: ["com.android.hardware.wifi-service.rc"],

    cmd: "sed -e 's@/vendor/bin/@/apex/com.android.hardware.wifi/bin/@' $(in) > $(out)",

}
@@ -28,7 +28,7 @@ prebuilt_etc { 


prebuilt_etc {

    name: "com.android.hardware.wifi.xml",

    src: ":default-android.hardware.wifi@1.0-service.xml",

    src: ":default-android.hardware.wifi-service.xml",

    installable: false,

}
@@ -43,13 +43,13 @@ apex { 
    updatable: false,

    soc_specific: true,

    binaries: [

        "android.hardware.wifi@1.0-service",

        "android.hardware.wifi-service",

    ],

    prebuilts: [

        "com.android.hardware.wifi.rc",

        "com.android.hardware.wifi.xml",

    ],

    overrides: [

        "android.hardware.wifi@1.0-service",

        "android.hardware.wifi-service",

    ],

}

wifi/apex/file_contexts

+1 −1
Original line number Diff line number Diff line 
(/.*)? 								u:object_r:vendor_file:s0

/bin/hw/android\.hardware\.wifi@1.0-service			u:object_r:hal_wifi_default_exec:s0

/bin/hw/android\.hardware\.wifi-service			u:object_r:hal_wifi_default_exec:s0

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

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ cc_test { 
        "android.hardware.wifi@1.3",

        "android.hardware.wifi@1.4",

        "android.hardware.wifi@1.5",

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

        "libwifi-system-iface",

        "VtsHalWifiTargetTestUtil",

    ],

    test_suites: [

        "general-tests",