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

Commit da830c9d authored by Jong Wook Kim's avatar Jong Wook Kim
Browse files

Uprev Wifi HAL to 1.3 

Move Wifi HAL from 1.2 to 1.3

Bug: 111753174
Test: Builds and wifi works
Change-Id: I6a2b203997d6328d09065f23636d4ce01420942a
parent 1867993b

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ 
    </hal>

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

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

        <version>1.0-2</version>

        <version>1.0-3</version>

        <interface>

            <name>IWifi</name>

            <instance>default</instance>

wifi/1.3/Android.bp

0 → 100644
+20 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen -Landroidbp.



hidl_interface {

    name: "android.hardware.wifi@1.3",

    root: "android.hardware",

    vndk: {

        enabled: true,

    },

    srcs: [

        "IWifi.hal",

    ],

    interfaces: [

        "android.hardware.wifi@1.0",

        "android.hardware.wifi@1.1",

        "android.hardware.wifi@1.2",

        "android.hidl.base@1.0",

    ],

    gen_java: true,

}

wifi/1.3/IWifi.hal

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.wifi@1.3;



import @1.2::IWifi;



/**

 * This is the root of the HAL module and is the interface returned when

 * loading an implementation of the Wi-Fi HAL. There must be at most one

 * module loaded in the system.

 * IWifi.getChip() must return @1.2::IWifiChip

 */

interface IWifi extends @1.2::IWifi {

};

wifi/1.2/default/Android.mk→wifi/1.3/default/Android.mk

+6 −3
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libwifi-system-iface \

    android.hardware.wifi@1.0 \

    android.hardware.wifi@1.1 \

    android.hardware.wifi@1.2

    android.hardware.wifi@1.2 \

    android.hardware.wifi@1.3

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)

include $(BUILD_STATIC_LIBRARY)
@@ -84,7 +85,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libwifi-system-iface \

    android.hardware.wifi@1.0 \

    android.hardware.wifi@1.1 \

    android.hardware.wifi@1.2

    android.hardware.wifi@1.2 \

    android.hardware.wifi@1.3

LOCAL_STATIC_LIBRARIES := \

    android.hardware.wifi@1.0-service-lib

LOCAL_INIT_RC := android.hardware.wifi@1.0-service.rc
@@ -120,5 +122,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    libwifi-system-iface \

    android.hardware.wifi@1.0 \

    android.hardware.wifi@1.1 \

    android.hardware.wifi@1.2

    android.hardware.wifi@1.2 \

    android.hardware.wifi@1.3

include $(BUILD_NATIVE_TEST)

wifi/1.2/default/OWNERS→wifi/1.3/default/OWNERS

+0 −0

File moved.

View file