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

Commit 22ab1cc2 authored by Ahmed ElArabawy's avatar Ahmed ElArabawy Committed by Android (Google) Code Review
Browse files

Merge "Wifi: Uprev Wifi HAL to 1.4"

parents 7b19ebb5 f501a98a

compatibility_matrices/compatibility_matrix.current.xml

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

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

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

        <version>1.0-3</version>

        <version>1.0-4</version>

        <interface>

            <name>IWifi</name>

            <instance>default</instance>

wifi/1.4/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.4",

    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.hardware.wifi@1.3",

        "android.hidl.base@1.0",

    ],

    gen_java: true,

}

wifi/1.4/IWifi.hal

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

 * Copyright 2019 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.4;



import @1.3::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.3::IWifi {

};

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

+9 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ LOCAL_PATH := $(call my-dir) 
###

include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.wifi@1.0-service-lib

LOCAL_VINTF_FRAGMENTS := android.hardware.wifi@1.0-service.xml

LOCAL_MODULE_RELATIVE_PATH := hw

LOCAL_PROPRIETARY_MODULE := true

LOCAL_CPPFLAGS := -Wall -Werror -Wextra
@@ -67,7 +68,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    android.hardware.wifi@1.0 \

    android.hardware.wifi@1.1 \

    android.hardware.wifi@1.2 \

    android.hardware.wifi@1.3

    android.hardware.wifi@1.3 \

    android.hardware.wifi@1.4

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)

include $(BUILD_STATIC_LIBRARY)
@@ -93,7 +95,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    android.hardware.wifi@1.0 \

    android.hardware.wifi@1.1 \

    android.hardware.wifi@1.2 \

    android.hardware.wifi@1.3

    android.hardware.wifi@1.3 \

    android.hardware.wifi@1.4

LOCAL_STATIC_LIBRARIES := \

    android.hardware.wifi@1.0-service-lib

LOCAL_INIT_RC := android.hardware.wifi@1.0-service.rc
@@ -123,7 +126,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    android.hardware.wifi@1.0 \

    android.hardware.wifi@1.1 \

    android.hardware.wifi@1.2 \

    android.hardware.wifi@1.3

    android.hardware.wifi@1.3 \

    android.hardware.wifi@1.4

LOCAL_STATIC_LIBRARIES := \

    android.hardware.wifi@1.0-service-lib

LOCAL_INIT_RC := android.hardware.wifi@1.0-service-lazy.rc
@@ -165,5 +169,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    android.hardware.wifi@1.0 \

    android.hardware.wifi@1.1 \

    android.hardware.wifi@1.2 \

    android.hardware.wifi@1.3

    android.hardware.wifi@1.3 \

    android.hardware.wifi@1.4

include $(BUILD_NATIVE_TEST)

wifi/1.3/default/OWNERS→wifi/1.4/default/OWNERS

+0 −0

File moved.

View file