commit 1bbab7c8eeb70be121ce7b423f662163a4f43540
author Miguel Aranda <miguelaranda@google.com> Fri Sep 02 13:06:50 2022 +0000
committer Miguel Aranda <miguelaranda@google.com> Fri Sep 02 13:06:50 2022 +0000
tree a86b5bb4fd6a1b5c31c22890c46ebc8b060393c8
parent b7e1bcf3b7b3e20616d8f8ae36a2f066689c3802

Revert "Update supplicant service to use V2 of the supplicant AI..."

Revert "Update framework dependencies to use the Supplicant AIDL..."

Revert submission 19760393-supplicant-v2

Reason for revert: b/244522531
Reverted Changes:
I538ca995a:Update framework dependencies to use the Supplican...
I4d5293c1f:Update supplicant service to use V2 of the supplic...

Change-Id: I261f8df291f5a11a8576680a6957f2e88b489611

wpa_supplicant/Android.bp

diff --git a/wpa_supplicant/Android.bp b/wpa_supplicant/Android.bp
index 01f6662..db11387 100644
--- a/wpa_supplicant/Android.bp
+++ b/wpa_supplicant/Android.bp
@@ -67,7 +67,7 @@
     defaults: ["wpa_supplicant_cflags_defaults"],
     srcs: [":wpa_supplicant_srcs"],
     shared_libs: [
-        "android.hardware.wifi.supplicant-V2-ndk",
+        "android.hardware.wifi.supplicant-V1-ndk",
         "libbase",
         "libbinder_ndk",
         "libc",

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 1da9e61..1eaebde 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1812,7 +1812,7 @@
 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-V1-ndk
 LOCAL_SHARED_LIBRARIES += libutils libbase
 LOCAL_SHARED_LIBRARIES += libbinder_ndk
 LOCAL_STATIC_LIBRARIES += libwpa_aidl
@@ -1884,7 +1884,7 @@
     aidl/sta_network.cpp \
     aidl/supplicant.cpp
 LOCAL_SHARED_LIBRARIES := \
-    android.hardware.wifi.supplicant-V2-ndk \
+    android.hardware.wifi.supplicant-V1-ndk \
     libbinder_ndk \
     libbase \
     libutils \

wpa_supplicant/aidl/Android.bp

diff --git a/wpa_supplicant/aidl/Android.bp b/wpa_supplicant/aidl/Android.bp
index 24c2079..0785fe1 100644
--- a/wpa_supplicant/aidl/Android.bp
+++ b/wpa_supplicant/aidl/Android.bp
@@ -33,7 +33,7 @@
     defaults: ["wpa_supplicant_cflags_defaults"],
     soc_specific: true,
     shared_libs: [
-        "android.hardware.wifi.supplicant-V2-ndk",
+        "android.hardware.wifi.supplicant-V1-ndk",
         "libbinder_ndk",
         "libbase",
         "libutils",