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

Commit 58ccf347 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "wifi: put vintf fragment into wifi apex" am: 9113258f 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2402793



Change-Id: Ie841dc7f777f2925d778c2dc4cf9d5260ed7fdaa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4aeebc00 9113258f

compatibility_matrices/compatibility_matrix.8.xml

+2 −2
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="aidl" optional="true">

    <hal format="aidl" optional="true" updatable-via-apex="true">

        <name>android.hardware.wifi</name>

        <version>1</version>

        <interface>
@@ -810,7 +810,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true" updatable-via-apex="true">

        <name>android.hardware.wifi</name>

        <version>1.3-6</version>

        <interface>

wifi/apex/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ prebuilt_etc { 
    name: "com.android.hardware.wifi.xml",

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

    installable: false,

    sub_dir: "vintf",

}



apex {
@@ -38,7 +39,6 @@ apex { 
    key: "com.android.hardware.wifi.key",

    certificate: ":com.android.hardware.wifi.certificate",

    file_contexts: "file_contexts",

    vintf_fragments: [":com.android.hardware.wifi.xml"],

    use_vndk_as_stable: true,

    updatable: false,

    soc_specific: true,

wifi/apex/file_contexts

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

/etc(/.*)?                                      u:object_r:vendor_configs_file:s0

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