!67 Clear HDF dependent files

Merge pull request !67 from jiachanglin/master

wpa_supplicant-2.9/build/Makefile

@@ -24,8 +24,8 @@ endif
 #TEST_AP = testap
 #TEST_WPA = testwpa
 
-WPA_LDFLAGS = -L$(DEPDIR) -lhdf_core -lhdf_posix_osal.z -lsec_shared -lrt -lm -lpthread -lhilog_shared -lwifi_driver_client
-TEST_LDFLAGS = -L./ -lwpa -L$(DEPDIR) -lhdf_core -lhdf_posix_osal.z -lsec_shared -lrt -lm -lpthread -lhilog_shared -lwifi_driver_client
+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_SHARED = libwpa.so
 WPA_STATIC = libwpa.a

wpa_supplicant-2.9/hostapd/Makefile

@@ -45,14 +45,13 @@ CFLAGS += -I$(abspath ../../../../third_party/bounds_checking_function/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/ability/sbuf/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/include/core)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core//adapter/syscall/include)
-CFLAGS += -I$(abspath ../../../../drivers/adapter/uhdf/posix/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core/shared/include)
 CFLAGS += -I$(abspath ../../../../drivers/peripheral/wlan/client/include)
 CFLAGS += -I$(abspath ../build/include)
 CFLAGS += -shared -fPIC
 CFLAGS += -fstack-protector-all
 CFLAGS += -DUSERSPACE_CLIENT_SUPPORT
-LIBS += -L$(DEPDIR) -lhdf_core -lhdf_posix_osal.z -lsec_shared -lhilog_shared -lwifi_driver_client
+LIBS += -L$(DEPDIR) -lsec_shared -lhilog_shared -lwifi_driver_client
 
 export BINDIR ?= /usr/local/bin/
 

wpa_supplicant-2.9/src/drivers/wpa_hal_event.c

@@ -10,7 +10,6 @@
 #include "utils/common.h"
 #include "driver.h"
 #include "eloop.h"
-#include "utils/hdf_base.h"
 #include "l2_packet/l2_packet.h"
 #include "wpa_hal.h"
 #include "wpa_supplicant_i.h"

wpa_supplicant-2.9/wpa_supplicant/Makefile

@@ -57,14 +57,13 @@ CFLAGS += -I$(abspath ../../../../drivers/framework/ability/sbuf/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core/shared/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/include/core)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core/adapter/syscall/include)
-CFLAGS += -I$(abspath ../../../../drivers/adapter/uhdf/posix/include)
 CFLAGS += -I$(abspath ../../../../third_party/bounds_checking_function/include)
 CFLAGS += -I$(abspath ../../../../drivers/peripheral/wlan/client/include)
 CFLAGS += -I$(abspath ../build/include)
 CFLAGS += -shared -fPIC
 CFLAGS += -DUSERSPACE_CLIENT_SUPPORT
 CFLAGS += -fstack-protector-all
-LIBS += -L$(DEPDIR) -lhdf_core -lhdf_posix_osal.z -lsec_shared -lhilog_shared -lwifi_driver_client
+LIBS += -L$(DEPDIR) -lsec_shared -lhilog_shared -lwifi_driver_client
 -include .config
 
 ifeq ($(COMPILER_TYPE), clang)

wpa_supplicant-2.9_standard/BUILD.gn

@@ -49,8 +49,6 @@ ohos_shared_library("wpa_client") {
     "$FWK_ROOT_DIR/core/shared/include",
     "$FWK_ROOT_DIR/include/core",
     "$FWK_ROOT_DIR/core/adapter/syscall/include",
-    "//drivers/adapter/uhdf/posix/include",
-    "//drivers/adapter/uhdf2/osal/include",
     "//drivers/peripheral/wlan/client/include",
     "//third_party/bounds_checking_function/include",
   ]
@@ -245,8 +243,6 @@ ohos_shared_library("wpa") {
     "$FWK_ROOT_DIR/core/shared/include",
     "$FWK_ROOT_DIR/include/core",
     "$FWK_ROOT_DIR/core/adapter/syscall/include",
-    "//drivers/adapter/uhdf/posix/include",
-    "//drivers/adapter/uhdf2/osal/include",
     "//drivers/peripheral/wlan/client/include",
     "//third_party/bounds_checking_function/include",
   ]
@@ -292,7 +288,6 @@ ohos_shared_library("wpa") {
 
   deps = [
     "//drivers/adapter/uhdf2/manager:hdf_devmgr",
-    "//drivers/adapter/uhdf2/utils:libhdf_utils",
     "//drivers/peripheral/wlan/client:wifi_driver_client",
     "//third_party/bounds_checking_function:libsec_static",
   ]

wpa_supplicant-2.9_standard/build/Makefile

@@ -39,8 +39,8 @@ DEPDIR_WIFIDRIVERCLIENT = $(abspath ../../../../out/ohos-arm-release/common/comm
 DEPDIR_HDFUTILS = $(abspath ../../../../out/ohos-arm-release/hdf/hdf)
 DEPDIR_HILOG = $(abspath ../../../../out/ohos-arm-release/hiviewdfx/hilog/)
 DEPDIR_SEC = $(abspath ../../../../device/hisilicon/hispark_taurus/sdk_linux/soc/lib/)
-WPA_LDFLAGS = -L$(DEPDIR_HDFUTILS) -lhdf_utils.z -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -lm -L$(DEPDIR_SEC) -lsecurec
-TEST_LDFLAGS = -L./ -lwpa -L$(DEPDIR_HDFUTILS) -lhdf_utils.z -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -lm -L$(DEPDIR_SEC) -lsecurec
+WPA_LDFLAGS = -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -lm -L$(DEPDIR_SEC) -lsecurec
+TEST_LDFLAGS = -L./ -lwpa -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -lm -L$(DEPDIR_SEC) -lsecurec
 
 WPA_SHARED = libwpa.so
 WPA_STATIC = libwpa.a

wpa_supplicant-2.9_standard/hostapd/Makefile

@@ -44,8 +44,6 @@ CFLAGS += -I$(abspath ../../../../third_party/bounds_checking_function/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/ability/sbuf/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/include/core)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core/adapter/syscall/include)
-CFLAGS += -I$(abspath ../../../../drivers/adapter/uhdf/posix/include)
-CFLAGS += -I$(abspath ../../../../drivers/adapter/uhdf2/osal/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core/shared/include)
 CFLAGS += -I$(abspath ../../../../drivers/peripheral/wlan/client/include)
 CFLAGS += -I$(abspath ../../../../base/hiviewdfx/hilog/interfaces/native/innerkits/include)
@@ -59,7 +57,7 @@ DEPDIR_WIFIDRIVERCLIENT = $(abspath ../../../../out/ohos-arm-release/common/comm
 DEPDIR_HDFUTILS = $(abspath ../../../../out/ohos-arm-release/hdf/hdf)
 DEPDIR_HILOG = $(abspath ../../../../out/ohos-arm-release/hiviewdfx/hilog/)
 DEPDIR_SEC = $(abspath ../../../../device/hisilicon/hispark_taurus/sdk_linux/soc/lib/)
-LIBS += -L$(DEPDIR_HDFUTILS) -lhdf_utils.z -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -L$(DEPDIR_SEC) -lsecurec
+LIBS += -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -L$(DEPDIR_SEC) -lsecurec
 
 export BINDIR ?= /usr/local/bin/
 

wpa_supplicant-2.9_standard/src/drivers/wpa_hal_event.c

@@ -10,7 +10,6 @@
 #include "utils/common.h"
 #include "driver.h"
 #include "eloop.h"
-#include "utils/hdf_base.h"
 #include "l2_packet/l2_packet.h"
 #include "wpa_hal.h"
 #include "wpa_supplicant_i.h"

wpa_supplicant-2.9_standard/wpa_supplicant/Makefile

@@ -60,8 +60,6 @@ CFLAGS += -I$(abspath ../../../../drivers/framework/ability/sbuf/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core/shared/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/include/core)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core/adapter/syscall/include)
-CFLAGS += -I$(abspath ../../../../drivers/adapter/uhdf/posix/include)
-CFLAGS += -I$(abspath ../../../../drivers/adapter/uhdf2/osal/include)
 CFLAGS += -I$(abspath ../../../../third_party/bounds_checking_function/include)
 CFLAGS += -I$(abspath ../../../../drivers/peripheral/wlan/client/include)
 CFLAGS += -I$(abspath ../../../../base/hiviewdfx/hilog/interfaces/native/innerkits/include)
@@ -75,7 +73,7 @@ DEPDIR_WIFIDRIVERCLIENT = $(abspath ../../../../out/ohos-arm-release/common/comm
 DEPDIR_HDFUTILS = $(abspath ../../../../out/ohos-arm-release/hdf/hdf)
 DEPDIR_HILOG = $(abspath ../../../../out/ohos-arm-release/hiviewdfx/hilog/)
 DEPDIR_SEC = $(abspath ../../../../device/hisilicon/hispark_taurus/sdk_linux/soc/lib/)
-LIBS += -L$(DEPDIR_HDFUTILS) -lhdf_utils.z -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -L$(DEPDIR_SEC) -lsecurec
+LIBS += -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -L$(DEPDIR_SEC) -lsecurec
 -include .config
 
 ifeq ($(COMPILER_TYPE), clang)