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

Commit c11ec2f5 authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge "[WIFI][TREBLE] Uprev Wi-Fi HAL 1.2"

parents fa8ff377 6ce50908
Loading
Loading
Loading
Loading

wifi/1.2/Android.bp

0 → 100644
+73 −0
Original line number Diff line number Diff line
// This file is autogenerated by hidl-gen. Do not edit manually.

filegroup {
    name: "android.hardware.wifi@1.2_hal",
    srcs: [
        "IWifi.hal",
        "IWifiChip.hal",
    ],
}

genrule {
    name: "android.hardware.wifi@1.2_genc++",
    tools: ["hidl-gen"],
    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.2",
    srcs: [
        ":android.hardware.wifi@1.2_hal",
    ],
    out: [
        "android/hardware/wifi/1.2/WifiAll.cpp",
        "android/hardware/wifi/1.2/WifiChipAll.cpp",
    ],
}

genrule {
    name: "android.hardware.wifi@1.2_genc++_headers",
    tools: ["hidl-gen"],
    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.2",
    srcs: [
        ":android.hardware.wifi@1.2_hal",
    ],
    out: [
        "android/hardware/wifi/1.2/IWifi.h",
        "android/hardware/wifi/1.2/IHwWifi.h",
        "android/hardware/wifi/1.2/BnHwWifi.h",
        "android/hardware/wifi/1.2/BpHwWifi.h",
        "android/hardware/wifi/1.2/BsWifi.h",
        "android/hardware/wifi/1.2/IWifiChip.h",
        "android/hardware/wifi/1.2/IHwWifiChip.h",
        "android/hardware/wifi/1.2/BnHwWifiChip.h",
        "android/hardware/wifi/1.2/BpHwWifiChip.h",
        "android/hardware/wifi/1.2/BsWifiChip.h",
    ],
}

cc_library {
    name: "android.hardware.wifi@1.2",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.wifi@1.2_genc++"],
    generated_headers: ["android.hardware.wifi@1.2_genc++_headers"],
    export_generated_headers: ["android.hardware.wifi@1.2_genc++_headers"],
    vendor_available: true,
    vndk: {
        enabled: true,
    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
        "libhwbinder",
        "liblog",
        "libutils",
        "libcutils",
        "android.hardware.wifi@1.0",
        "android.hardware.wifi@1.1",
    ],
    export_shared_lib_headers: [
        "libhidlbase",
        "libhidltransport",
        "libhwbinder",
        "libutils",
        "android.hardware.wifi@1.0",
        "android.hardware.wifi@1.1",
    ],
}

wifi/1.2/Android.mk

0 → 100644
+64 −0
Original line number Diff line number Diff line
# This file is autogenerated by hidl-gen. Do not edit manually.

LOCAL_PATH := $(call my-dir)

################################################################################

include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.wifi-V1.2-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES

intermediates := $(call local-generated-sources-dir, COMMON)

HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

LOCAL_JAVA_LIBRARIES := \
    android.hardware.wifi-V1.0-java \
    android.hardware.wifi-V1.1-java \
    android.hidl.base-V1.0-java \

LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES += core-oj hwbinder

#
# Build IWifi.hal
#
GEN := $(intermediates)/android/hardware/wifi/V1_2/IWifi.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifi.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
        -Ljava \
        -randroid.hardware:hardware/interfaces \
        -randroid.hidl:system/libhidl/transport \
        android.hardware.wifi@1.2::IWifi

$(GEN): $(LOCAL_PATH)/IWifi.hal
	$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)

#
# Build IWifiChip.hal
#
GEN := $(intermediates)/android/hardware/wifi/V1_2/IWifiChip.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiChip.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
        -Ljava \
        -randroid.hardware:hardware/interfaces \
        -randroid.hidl:system/libhidl/transport \
        android.hardware.wifi@1.2::IWifiChip

$(GEN): $(LOCAL_PATH)/IWifiChip.hal
	$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
include $(BUILD_JAVA_LIBRARY)



include $(call all-makefiles-under,$(LOCAL_PATH))

wifi/1.2/IWifi.hal

0 → 100644
+29 −0
Original line number Diff line number Diff line
/*
 * Copyright 2017 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.2;

import @1.1::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() may return either a @1.0::IWifiChip or @1.1::IWifiChip
 * or @1.2:IWifiChip
 */
interface IWifi extends @1.1::IWifi {
};

wifi/1.2/IWifiChip.hal

0 → 100644
+27 −0
Original line number Diff line number Diff line
/*
 * Copyright 2017 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.2;

import @1.1::IWifiChip;

/**
 * Interface that represents a chip that must be configured as a single unit.
 * The HAL/driver/firmware will be responsible for determining which phy is used
 * to perform operations like NAN, RTT, etc.
 */
interface IWifiChip extends @1.1::IWifiChip {
};
+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ LOCAL_SRC_FILES := \
LOCAL_SHARED_LIBRARIES := \
    android.hardware.wifi@1.0 \
    android.hardware.wifi@1.1 \
    android.hardware.wifi@1.2 \
    libbase \
    libcutils \
    libhidlbase \
Loading