diff options
| author | Gabriel Biren <gbiren@google.com> | 2023-11-21 23:15:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-11-21 23:15:24 +0000 |
| commit | c2bf7d9fdd1155ceb0354155debe474bf7bcd95f (patch) | |
| tree | b9f996c1a92a57b41234912e69221823adfc953a | |
| parent | 8bae4256a8a04bbaf9b11e71f7facb724736ee36 (diff) | |
| parent | 3c3347ec5723ad7f5c47395265a529965909552c (diff) | |
| download | wpa_supplicant_8-c2bf7d9fdd1155ceb0354155debe474bf7bcd95f.tar.gz | |
Merge "Upgrade hostapd service to implement V2 of the Hostapd HAL." into main
| -rw-r--r-- | hostapd/Android.bp | 2 | ||||
| -rw-r--r-- | hostapd/Android.mk | 6 | ||||
| -rw-r--r-- | hostapd/aidl/Android.bp | 2 | ||||
| -rw-r--r-- | hostapd/android.hardware.wifi.hostapd.xml | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/hostapd/Android.bp b/hostapd/Android.bp index e4b37186..119f66ef 100644 --- a/hostapd/Android.bp +++ b/hostapd/Android.bp @@ -45,7 +45,7 @@ cc_defaults { defaults: ["hostapd_cflags_defaults"], srcs: [":hostapd_srcs"], shared_libs: [ - "android.hardware.wifi.hostapd-V1-ndk", + "android.hardware.wifi.hostapd-V2-ndk", "libbase", "libutils", "libbinder_ndk", diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 7a1b612e..35ada837 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -1194,7 +1194,8 @@ LOCAL_STATIC_LIBRARIES += libnl_2 endif endif ifeq ($(HOSTAPD_USE_AIDL), y) -LOCAL_SHARED_LIBRARIES += android.hardware.wifi.hostapd-V1-ndk +LOCAL_SHARED_LIBRARIES += android.hardware.wifi.hostapd-V2-ndk +LOCAL_SHARED_LIBRARIES += android.hardware.wifi.common-V1-ndk LOCAL_SHARED_LIBRARIES += libbase libutils LOCAL_SHARED_LIBRARIES += libbinder_ndk LOCAL_STATIC_LIBRARIES += libhostapd_aidl @@ -1248,7 +1249,8 @@ LOCAL_SRC_FILES := \ aidl/aidl.cpp \ aidl/hostapd.cpp LOCAL_SHARED_LIBRARIES := \ - android.hardware.wifi.hostapd-V1-ndk \ + android.hardware.wifi.hostapd-V2-ndk \ + android.hardware.wifi.common-V1-ndk \ libbinder_ndk \ libbase \ libutils \ diff --git a/hostapd/aidl/Android.bp b/hostapd/aidl/Android.bp index 3cbccee3..410e701c 100644 --- a/hostapd/aidl/Android.bp +++ b/hostapd/aidl/Android.bp @@ -31,7 +31,7 @@ cc_library_static { defaults: ["hostapd_cflags_defaults"], soc_specific: true, shared_libs: [ - "android.hardware.wifi.hostapd-V1-ndk", + "android.hardware.wifi.hostapd-V2-ndk", "libbinder_ndk", "libbase", "libutils", diff --git a/hostapd/android.hardware.wifi.hostapd.xml b/hostapd/android.hardware.wifi.hostapd.xml index eb91ee20..c0fe942f 100644 --- a/hostapd/android.hardware.wifi.hostapd.xml +++ b/hostapd/android.hardware.wifi.hostapd.xml @@ -1,6 +1,7 @@ <manifest version="1.0" type="device"> <hal format="aidl"> <name>android.hardware.wifi.hostapd</name> + <version>2</version> <fqname>IHostapd/default</fqname> </hal> </manifest> |