Merge "Wifi: Uprev wifi HAL to 1.6" (640c82d4) · Commits · e / os / android_hardware_interfaces

compatibility_matrices/compatibility_matrix.current.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -778,7 +778,7 @@
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.wifi</name>
		<version>1.3-5</version>
		<version>1.3-6</version>
		<interface>
		<name>IWifi</name>
		<instance>default</instance>

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		// This file is autogenerated by hidl-gen -Landroidbp.

		package {
		// See: http://go/android-license-faq
		// A large-scale-change added 'default_applicable_licenses' to import
		// all of the 'license_kinds' from "hardware_interfaces_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_applicable_licenses: ["hardware_interfaces_license"],
		}

		hidl_interface {
		name: "android.hardware.wifi@1.6",
		root: "android.hardware",
		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.hardware.wifi@1.4",
		"android.hardware.wifi@1.5",
		"android.hidl.base@1.0",
		],
		gen_java: true,
		apex_available: [
		"//apex_available:platform",
		"com.android.wifi",
		],
		}

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2022 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.6;

		import @1.5::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.5::IWifiChip
		*/
		interface IWifi extends @1.5::IWifi {};

+0 −0

File moved.

+7 −3

Original line number	Diff line number	Diff line
		@@ -77,7 +77,8 @@ LOCAL_SHARED_LIBRARIES := \
		android.hardware.wifi@1.2 \
		android.hardware.wifi@1.3 \
		android.hardware.wifi@1.4 \
		android.hardware.wifi@1.5
		android.hardware.wifi@1.5 \
		android.hardware.wifi@1.6
		LOCAL_C_INCLUDES += $(TOP)/external/libxml2/include
		LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
		include $(BUILD_STATIC_LIBRARY)
		@@ -111,7 +112,8 @@ LOCAL_SHARED_LIBRARIES := \
		android.hardware.wifi@1.2 \
		android.hardware.wifi@1.3 \
		android.hardware.wifi@1.4 \
		android.hardware.wifi@1.5
		android.hardware.wifi@1.5 \
		android.hardware.wifi@1.6
		LOCAL_STATIC_LIBRARIES := \
		android.hardware.wifi@1.0-service-lib
		LOCAL_INIT_RC := android.hardware.wifi@1.0-service.rc
		@@ -148,7 +150,8 @@ LOCAL_SHARED_LIBRARIES := \
		android.hardware.wifi@1.2 \
		android.hardware.wifi@1.3 \
		android.hardware.wifi@1.4 \
		android.hardware.wifi@1.5
		android.hardware.wifi@1.5 \
		android.hardware.wifi@1.6
		LOCAL_STATIC_LIBRARIES := \
		android.hardware.wifi@1.0-service-lib
		LOCAL_INIT_RC := android.hardware.wifi@1.0-service-lazy.rc
		@@ -185,6 +188,7 @@ LOCAL_STATIC_LIBRARIES := \
		android.hardware.wifi@1.3 \
		android.hardware.wifi@1.4 \
		android.hardware.wifi@1.5 \
		android.hardware.wifi@1.6 \
		android.hardware.wifi@1.0-service-lib
		LOCAL_SHARED_LIBRARIES := \
		libbase \