From a6489738b912b80e95999761103b9293a094a64e Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Mon, 25 Sep 2017 14:57:43 -0700 Subject: [PATCH] supplicant(interface): Uprev to 1.1 Bug: 65673412 Test: Device boots up and connects to wifi networks. Change-Id: Ide9ee6292252116fe7db7f48d1e54716bf24b569 --- wifi/Android.bp | 1 + wifi/supplicant/1.1/Android.bp | 144 ++++++++++++++++++++++++++++ wifi/supplicant/1.1/Android.mk | 44 +++++++++ wifi/supplicant/1.1/ISupplicant.hal | 27 ++++++ 4 files changed, 216 insertions(+) create mode 100644 wifi/supplicant/1.1/Android.bp create mode 100644 wifi/supplicant/1.1/Android.mk create mode 100644 wifi/supplicant/1.1/ISupplicant.hal diff --git a/wifi/Android.bp b/wifi/Android.bp index 14521ee2e8..efc6fa733d 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -9,4 +9,5 @@ subdirs = [ "offload/1.0/vts/functional", "supplicant/1.0", "supplicant/1.0/vts/functional", + "supplicant/1.1", ] diff --git a/wifi/supplicant/1.1/Android.bp b/wifi/supplicant/1.1/Android.bp new file mode 100644 index 0000000000..c232a6c297 --- /dev/null +++ b/wifi/supplicant/1.1/Android.bp @@ -0,0 +1,144 @@ +// This file is autogenerated by hidl-gen. Do not edit manually. + +filegroup { + name: "android.hardware.wifi.supplicant@1.1_hal", + srcs: [ + "ISupplicant.hal", + ], +} + +genrule { + name: "android.hardware.wifi.supplicant@1.1_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.1", + srcs: [ + ":android.hardware.wifi.supplicant@1.1_hal", + ], + out: [ + "android/hardware/wifi/supplicant/1.1/SupplicantAll.cpp", + ], +} + +genrule { + name: "android.hardware.wifi.supplicant@1.1_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.supplicant@1.1", + srcs: [ + ":android.hardware.wifi.supplicant@1.1_hal", + ], + out: [ + "android/hardware/wifi/supplicant/1.1/ISupplicant.h", + "android/hardware/wifi/supplicant/1.1/IHwSupplicant.h", + "android/hardware/wifi/supplicant/1.1/BnHwSupplicant.h", + "android/hardware/wifi/supplicant/1.1/BpHwSupplicant.h", + "android/hardware/wifi/supplicant/1.1/BsSupplicant.h", + ], +} + +cc_library { + name: "android.hardware.wifi.supplicant@1.1", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.wifi.supplicant@1.1_genc++"], + generated_headers: ["android.hardware.wifi.supplicant@1.1_genc++_headers"], + export_generated_headers: ["android.hardware.wifi.supplicant@1.1_genc++_headers"], + vendor_available: true, + vndk: { + enabled: true, + }, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "android.hardware.wifi.supplicant@1.0", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "android.hardware.wifi.supplicant@1.0", + ], +} + +genrule { + name: "android.hardware.wifi.supplicant@1.1-adapter-helper_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.1", + srcs: [ + ":android.hardware.wifi.supplicant@1.1_hal", + ], + out: [ + "android/hardware/wifi/supplicant/1.1/ASupplicant.cpp", + ], +} + +genrule { + name: "android.hardware.wifi.supplicant@1.1-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.1", + srcs: [ + ":android.hardware.wifi.supplicant@1.1_hal", + ], + out: [ + "android/hardware/wifi/supplicant/1.1/ASupplicant.h", + ], +} + + +cc_library { + name: "android.hardware.wifi.supplicant@1.1-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.wifi.supplicant@1.1-adapter-helper_genc++"], + generated_headers: ["android.hardware.wifi.supplicant@1.1-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.wifi.supplicant@1.1-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.wifi.supplicant@1.0", + "android.hardware.wifi.supplicant@1.1", + "android.hardware.wifi.supplicant@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.wifi.supplicant@1.0", + "android.hardware.wifi.supplicant@1.1", + "android.hardware.wifi.supplicant@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.wifi.supplicant@1.1-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.1", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.wifi.supplicant@1.1-adapter", + defaults: ["hidl-module-defaults"], + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.wifi.supplicant@1.0", + "android.hardware.wifi.supplicant@1.1", + "android.hardware.wifi.supplicant@1.1-adapter-helper", + ], + generated_sources: ["android.hardware.wifi.supplicant@1.1-adapter_genc++"], +} diff --git a/wifi/supplicant/1.1/Android.mk b/wifi/supplicant/1.1/Android.mk new file mode 100644 index 0000000000..198122edb9 --- /dev/null +++ b/wifi/supplicant/1.1/Android.mk @@ -0,0 +1,44 @@ +# This file is autogenerated by hidl-gen. Do not edit manually. + +LOCAL_PATH := $(call my-dir) + +################################################################################ + +include $(CLEAR_VARS) +LOCAL_MODULE := android.hardware.wifi.supplicant-V1.1-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.supplicant-V1.0-java \ + android.hidl.base-V1.0-java \ + +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES += core-oj hwbinder + +# +# Build ISupplicant.hal +# +GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_1/ISupplicant.java +$(GEN): $(HIDL) +$(GEN): PRIVATE_HIDL := $(HIDL) +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.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.supplicant@1.1::ISupplicant + +$(GEN): $(LOCAL_PATH)/ISupplicant.hal + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) +include $(BUILD_JAVA_LIBRARY) + + + +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/wifi/supplicant/1.1/ISupplicant.hal b/wifi/supplicant/1.1/ISupplicant.hal new file mode 100644 index 0000000000..5c60b35321 --- /dev/null +++ b/wifi/supplicant/1.1/ISupplicant.hal @@ -0,0 +1,27 @@ +/* + * Copyright 2016 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.supplicant@1.1; + +import @1.0::ISupplicant; + +/** + * Interface exposed by the supplicant HIDL service registered + * with the hardware service manager. + * This is the root level object for any the supplicant interactions. + */ +interface ISupplicant extends @1.0::ISupplicant { +};