!87 1.支持日志输出到文件的config； 2.避免自动使能NL80211_HISI； 3.RK支持NL80211；

Merge pull request !87 from 毛宇锋/cherry-pick-1647256599

wpa_supplicant-2.9_standard/BUILD.gn

@@ -16,7 +16,13 @@ import("//build/ohos.gni")
 FWK_ROOT_DIR = "//drivers/framework"
 WPA_ROOT_DIR = "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard"
 
-if ("${product_name}" == "m40" || "${product_name}" == "iot-router") {
+if ("${product_name}" == "m40") {
+  CONFIG_HISI = "true"
+} else {
+  CONFIG_HISI = "false"
+}
+if ("${product_name}" == "m40" || "${product_name}" == "iot-router" ||
+    "${product_name}" == "rk3568") {
   CONFIG_DRIVER = "nl80211"
 } else {
   CONFIG_DRIVER = "hdf"
@@ -84,6 +90,7 @@ ohos_shared_library("wpa_client") {
     "-DCONFIG_NO_CONFIG_WRITE",
     "-DCONFIG_NO_CONFIG_BLOBS",
     "-DUSERSPACE_CLIENT_SUPPORT",
+    "-DCONFIG_DEBUG_FILE",
   ]
 
   if ("${CONFIG_DRIVER}" == "nl80211") {
@@ -325,7 +332,6 @@ ohos_shared_library("wpa") {
       "$WPA_ROOT_DIR/src/drivers/linux_ioctl.c",
       "$WPA_ROOT_DIR/src/drivers/netlink.c",
       "$WPA_ROOT_DIR/src/drivers/rfkill.c",
-      "$WPA_ROOT_DIR/wpa_supplicant_lib/driver_nl80211_hisi.c",
     ]
     include_dirs += [
       "$WPA_ROOT_DIR/libnl/include/libnl3",
@@ -336,7 +342,7 @@ ohos_shared_library("wpa") {
       "-DCONFIG_DRIVER_NL80211",
       "-DCONFIG_LIBNL32",
       "-DCONFIG_LIBNL20",
-      "-DCONFIG_DRIVER_NL80211_HISI",
+      "-DCONFIG_DEBUG_FILE",
     ]
     deps += [ "//third_party/libnl:libnl_share" ]
   } else {
@@ -349,6 +355,10 @@ ohos_shared_library("wpa") {
       "-DCONFIG_OHOS_P2P",
     ]
   }
+  if ("${CONFIG_HISI}" == "true") {
+    sources += [ "$WPA_ROOT_DIR/wpa_supplicant_lib/driver_nl80211_hisi.c" ]
+    cflags += [ "-DCONFIG_DRIVER_NL80211_HISI" ]
+  }
 
   configs = [ ":wpa_warnings" ]
   part_name = "wpa_supplicant-2.9"
@@ -405,6 +415,7 @@ ohos_executable("wpa_cli") {
     "-DCONFIG_GAS",
     "-DCONFIG_OFFCHANNEL",
     "-DCONFIG_MAGICLINK",
+    "-DCONFIG_DEBUG_FILE",
   ]
 
   if ("${CONFIG_DRIVER}" == "nl80211") {
@@ -480,6 +491,7 @@ ohos_executable("hostapd_cli") {
     "-DEAP_SERVER",
     "-DCONFIG_GAS",
     "-DCONFIG_OFFCHANNEL",
+    "-DCONFIG_DEBUG_FILE",
   ]
 
   if ("${CONFIG_DRIVER}" == "nl80211") {
@@ -505,6 +517,7 @@ ohos_executable("wpa_supplicant") {
 
   deps = [ "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard:wpa" ]
   configs = [ ":wpa_warnings" ]
+  cflags = [ "-DCONFIG_DEBUG_FILE" ]
   part_name = "wpa_supplicant-2.9"
   subsystem_name = "wpa_supplicant-2.9"
 }
@@ -517,6 +530,7 @@ ohos_executable("hostapd") {
   deps = [ "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard:wpa" ]
 
   configs = [ ":wpa_warnings" ]
+  cflags = [ "-DCONFIG_DEBUG_FILE" ]
   part_name = "wpa_supplicant-2.9"
   subsystem_name = "wpa_supplicant-2.9"
 }