diff --git a/wpa_supplicant-2.9/build/Makefile b/wpa_supplicant-2.9/build/Makefile index 2f312b057c24084930ef518f3393b2f38514741f..46cc69025a89725ded207cbd8f28ebfac2aba95a 100755 --- a/wpa_supplicant-2.9/build/Makefile +++ b/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 diff --git a/wpa_supplicant-2.9/hostapd/Makefile b/wpa_supplicant-2.9/hostapd/Makefile index fdea24755448900fe22dc56ff4ac37feed2d3ad7..2073696a94082daa16e8a2f9c54514018dfde606 100755 --- a/wpa_supplicant-2.9/hostapd/Makefile +++ b/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/ diff --git a/wpa_supplicant-2.9/wpa_supplicant/Makefile b/wpa_supplicant-2.9/wpa_supplicant/Makefile index 50f03f3120cfac27762b1d4b0160b091caaf45ae..76404fa45c3f8b2e6e2bcb982ae5357190c2bd79 100755 --- a/wpa_supplicant-2.9/wpa_supplicant/Makefile +++ b/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) diff --git a/wpa_supplicant-2.9_standard/BUILD.gn b/wpa_supplicant-2.9_standard/BUILD.gn index 7644a5728b0bde2b6a0f4d1fc58f6d5ed725add5..0519b149a288883aaeb6ab948e7135028c5867ff 100644 --- a/wpa_supplicant-2.9_standard/BUILD.gn +++ b/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") { diff --git a/wpa_supplicant-2.9_standard/bundle.json b/wpa_supplicant-2.9_standard/bundle.json index 668dde82454c43e3b0ba732fc290a4ce7a2c5bba..96043101bb9b77f91a41023a52fe8d203b1eeb2a 100644 --- a/wpa_supplicant-2.9_standard/bundle.json +++ b/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": [