modify BUILD.gn and Makefile for wifi_driver_client

Signed-off-by: 徐杰 <xujie223@huawei.com>

wpa_supplicant-2.9/build/Makefile

@@ -24,8 +24,8 @@ endif
 #TEST_AP = testap
 #TEST_WPA = testwpa
 
-WPA_LDFLAGS = -L$(DEPDIR) -lsec_shared -lrt -lm -lpthread -lhilog_shared -lwifi_driver_client
-TEST_LDFLAGS = -L./ -lwpa -L$(DEPDIR) -lsec_shared -lrt -lm -lpthread -lhilog_shared -lwifi_driver_client
+WPA_LDFLAGS = -L$(DEPDIR) -lsec_shared -lrt -lm -lpthread -lhilog_shared -lwifi_driver_client.z
+TEST_LDFLAGS = -L./ -lwpa -L$(DEPDIR) -lsec_shared -lrt -lm -lpthread -lhilog_shared -lwifi_driver_client.z
 
 WPA_SHARED = libwpa.so
 WPA_STATIC = libwpa.a

wpa_supplicant-2.9/hostapd/Makefile

@@ -51,7 +51,7 @@ CFLAGS += -I$(abspath ../build/include)
 CFLAGS += -shared -fPIC
 CFLAGS += -fstack-protector-all
 CFLAGS += -DUSERSPACE_CLIENT_SUPPORT
-LIBS += -L$(DEPDIR) -lsec_shared -lhilog_shared -lwifi_driver_client
+LIBS += -L$(DEPDIR) -lsec_shared -lhilog_shared -lwifi_driver_client.z
 
 export BINDIR ?= /usr/local/bin/
 

wpa_supplicant-2.9/wpa_supplicant/Makefile

@@ -63,7 +63,7 @@ CFLAGS += -I$(abspath ../build/include)
 CFLAGS += -shared -fPIC
 CFLAGS += -DUSERSPACE_CLIENT_SUPPORT
 CFLAGS += -fstack-protector-all
-LIBS += -L$(DEPDIR) -lsec_shared -lhilog_shared -lwifi_driver_client
+LIBS += -L$(DEPDIR) -lsec_shared -lhilog_shared -lwifi_driver_client.z
 -include .config
 
 ifeq ($(COMPILER_TYPE), clang)

wpa_supplicant-2.9_standard/BUILD.gn

@@ -114,7 +114,7 @@ ohos_shared_library("wpa_client") {
   }
 
   external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "init:libbegetutil",
   ]
   if ("${CONFIG_DRIVER}" == "nl80211") {
@@ -157,7 +157,7 @@ ohos_shared_library("wpa_client_updater") {
   }
 
   external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "init:libbegetutil",
   ]
 
@@ -427,13 +427,13 @@ ohos_shared_library("wpa") {
   ]
 
   deps = [
-    "//drivers/peripheral/wlan/client:wifi_driver_client",
     "//third_party/bounds_checking_function:libsec_static",
     "//third_party/openssl:libcrypto_shared",
     "//third_party/openssl:libssl_shared",
   ]
   external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
+    "drivers_peripheral_wlan:wifi_driver_client",
+    "hilog:libhilog",
     "init:libbegetutil",
   ]
 
@@ -573,14 +573,14 @@ ohos_shared_library("wpa_updater") {
   ]
 
   deps = [
-    "//drivers/peripheral/wlan/client:wifi_driver_client",
     "//third_party/bounds_checking_function:libsec_static",
     "//third_party/openssl:libcrypto_shared",
     "//third_party/openssl:libssl_shared",
   ]
 
   external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
+    "drivers_peripheral_wlan:wifi_driver_client",
+    "hilog:libhilog",
     "init:libbegetutil",
   ]
 
@@ -707,7 +707,7 @@ ohos_executable("wpa_cli") {
   }
 
   external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "init:libbegetutil",
   ]
 
@@ -780,7 +780,7 @@ ohos_executable("hostapd_cli") {
   }
 
   external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "init:libbegetutil",
   ]
   if ("${CONFIG_DRIVER}" == "nl80211") {

wpa_supplicant-2.9_standard/bundle.json

@@ -18,11 +18,14 @@
     "subsystem": "wpa_supplicant-2.9",
     "syscap": [],
     "features": [],
-    "adapted_system_type": [],
+    "adapted_system_type": ["small","standard"],
     "rom": "2.1MB",
     "ram": "4.6MB",
     "deps": {
       "components": [
+        "certificate_manager",
+        "drivers_peripheral_wlan",
+        "hilog",
         "init"
       ],
       "third_party": [