aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunil Ravi <sunilravi@google.com>2023-11-06 23:23:30 +0000
committerSunil Ravi <sunilravi@google.com>2023-11-06 23:35:18 +0000
commit3db35ffa0816af9e8a4a7073722f50202e587e58 (patch)
tree3bfa4df35e745723fb58ecf7b455012b749b8956
parent37dedde04065e0394a1a0f92e06ed7e067d8d3f6 (diff)
downloadwpa_supplicant_8-3db35ffa0816af9e8a4a7073722f50202e587e58.tar.gz
Update supplicant service to use supplicant AIDL V3 interface.
Bug: 291202830 Test: Build successfully Test: Establish P2P connection and verified from the logs that the P2P Client IP address is received to framework via new HAL API. Change-Id: I0905901814ba51f3ba2792d99f5c9514e5303dc0
-rw-r--r--wpa_supplicant/Android.bp4
-rw-r--r--wpa_supplicant/Android.mk4
-rw-r--r--wpa_supplicant/aidl/Android.bp2
-rw-r--r--wpa_supplicant/aidl/android.hardware.wifi.supplicant.xml2
4 files changed, 6 insertions, 6 deletions
diff --git a/wpa_supplicant/Android.bp b/wpa_supplicant/Android.bp
index 664c65cd..ca56d143 100644
--- a/wpa_supplicant/Android.bp
+++ b/wpa_supplicant/Android.bp
@@ -67,7 +67,7 @@ cc_defaults {
defaults: ["wpa_supplicant_cflags_defaults"],
srcs: [":wpa_supplicant_srcs"],
shared_libs: [
- "android.hardware.wifi.supplicant-V2-ndk",
+ "android.hardware.wifi.supplicant-V3-ndk",
"android.system.keystore2-V1-ndk",
"libbase",
"libbinder_ndk",
@@ -445,4 +445,4 @@ filegroup {
"wpa_supplicant.c",
"wps_supplicant.c",
],
-} \ No newline at end of file
+}
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index c3a7bc64..9f685220 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1952,7 +1952,7 @@ ifeq ($(DBUS), y)
LOCAL_SHARED_LIBRARIES += libdbus
endif
ifeq ($(WPA_SUPPLICANT_USE_AIDL), y)
-LOCAL_SHARED_LIBRARIES += android.hardware.wifi.supplicant-V2-ndk
+LOCAL_SHARED_LIBRARIES += android.hardware.wifi.supplicant-V3-ndk
LOCAL_SHARED_LIBRARIES += android.system.keystore2-V1-ndk
LOCAL_SHARED_LIBRARIES += libutils libbase
LOCAL_SHARED_LIBRARIES += libbinder_ndk
@@ -2026,7 +2026,7 @@ LOCAL_SRC_FILES := \
aidl/sta_network.cpp \
aidl/supplicant.cpp
LOCAL_SHARED_LIBRARIES := \
- android.hardware.wifi.supplicant-V2-ndk \
+ android.hardware.wifi.supplicant-V3-ndk \
android.system.keystore2-V1-ndk \
libbinder_ndk \
libbase \
diff --git a/wpa_supplicant/aidl/Android.bp b/wpa_supplicant/aidl/Android.bp
index d7dcf972..481ad0b3 100644
--- a/wpa_supplicant/aidl/Android.bp
+++ b/wpa_supplicant/aidl/Android.bp
@@ -33,7 +33,7 @@ cc_library_static {
defaults: ["wpa_supplicant_cflags_defaults"],
soc_specific: true,
shared_libs: [
- "android.hardware.wifi.supplicant-V2-ndk",
+ "android.hardware.wifi.supplicant-V3-ndk",
"android.system.keystore2-V1-ndk",
"libbinder_ndk",
"libbase",
diff --git a/wpa_supplicant/aidl/android.hardware.wifi.supplicant.xml b/wpa_supplicant/aidl/android.hardware.wifi.supplicant.xml
index b80daddf..37cc3af3 100644
--- a/wpa_supplicant/aidl/android.hardware.wifi.supplicant.xml
+++ b/wpa_supplicant/aidl/android.hardware.wifi.supplicant.xml
@@ -1,7 +1,7 @@
<manifest version="1.0" type="device">
<hal format="aidl">
<name>android.hardware.wifi.supplicant</name>
- <version>2</version>
+ <version>3</version>
<fqname>ISupplicant/default</fqname>
</hal>
</manifest>