From 95e593a965f18d1fcadcc98534a9a45ec7c0af5b Mon Sep 17 00:00:00 2001 From: wangyikai Date: Wed, 14 Aug 2024 16:27:02 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90hdf=5Fcore=E3=80=91=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E6=9E=84=E5=BB=BA=E7=BC=96=E8=AF=91=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyikai --- adapter/uhdf2/hdi/test/BUILD.gn | 10 +++++----- adapter/uhdf2/hdi/test/smq_test/BUILD.gn | 4 ++-- adapter/uhdf2/host/test/BUILD.gn | 15 ++++++++++----- adapter/uhdf2/osal/test/BUILD.gn | 12 ++++++------ .../model/network/wifi/core/module/wifi_base.c | 2 +- .../{src => include}/message/message_dispatcher.h | 0 .../message/message_router_inner.h | 0 .../{src => include}/message/shared_obj.h | 0 .../wifi/platform/src/message/nodes/local_node.c | 2 +- .../devmgr_cpp_fuzzer/loaddevice_fuzzer/BUILD.gn | 1 - .../unloaddevice_fuzzer/BUILD.gn | 1 - .../ioservicebind_fuzzer/BUILD.gn | 1 - .../ioservicegrouplisten_fuzzer/BUILD.gn | 5 +---- .../ioservicelisten_fuzzer/BUILD.gn | 5 +---- .../ioserviceremove_fuzzer/BUILD.gn | 5 +---- .../BUILD.gn | 1 - 16 files changed, 28 insertions(+), 36 deletions(-) rename framework/model/network/wifi/platform/{src => include}/message/message_dispatcher.h (100%) rename framework/model/network/wifi/platform/{src => include}/message/message_router_inner.h (100%) rename framework/model/network/wifi/platform/{src => include}/message/shared_obj.h (100%) diff --git a/adapter/uhdf2/hdi/test/BUILD.gn b/adapter/uhdf2/hdi/test/BUILD.gn index fcd96a101..90c7514e8 100644 --- a/adapter/uhdf2/hdi/test/BUILD.gn +++ b/adapter/uhdf2/hdi/test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("./../../../../adapter/uhdf2/uhdf.gni") +import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") module_output_path = "hdf_core/srvmgr" @@ -26,8 +26,6 @@ ohos_unittest("HdiServiceManagerTest") { "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", "$hdf_uhdf_path/utils:libhdf_utils", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", ] include_dirs = [ @@ -42,6 +40,8 @@ ohos_unittest("HdiServiceManagerTest") { external_deps = [ "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_single", ] @@ -62,12 +62,12 @@ ohos_unittest("HdiServiceManagerTestCC") { deps = [ "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/utils:libhdf_utils", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", ] external_deps = [ "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", diff --git a/adapter/uhdf2/hdi/test/smq_test/BUILD.gn b/adapter/uhdf2/hdi/test/smq_test/BUILD.gn index 97543818b..ef817cec7 100644 --- a/adapter/uhdf2/hdi/test/smq_test/BUILD.gn +++ b/adapter/uhdf2/hdi/test/smq_test/BUILD.gn @@ -24,8 +24,6 @@ ohos_unittest("HdiSmqTest") { "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", "$hdf_uhdf_path/utils:libhdf_utils", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", ] include_dirs = [ @@ -39,6 +37,8 @@ ohos_unittest("HdiSmqTest") { external_deps = [ "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_single", ] diff --git a/adapter/uhdf2/host/test/BUILD.gn b/adapter/uhdf2/host/test/BUILD.gn index 4295296c7..279a46b8f 100644 --- a/adapter/uhdf2/host/test/BUILD.gn +++ b/adapter/uhdf2/host/test/BUILD.gn @@ -27,7 +27,6 @@ ohos_unittest("DevMgrTest") { ] include_dirs = [ - "//commonlibrary/c_utils/base/include", "$hdf_framework_path/include/osal", "$hdf_framework_path/include/utils", "$hdf_framework_path/utils/include", @@ -41,8 +40,6 @@ ohos_unittest("DevMgrTest") { deps = [ "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/utils:libhdf_utils", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", ] if (with_sample) { @@ -58,6 +55,11 @@ ohos_unittest("DevMgrTest") { } else { external_deps = [ "hilog:libhilog" ] } + + external_deps += [ + "googletest:gmock_main", + "googletest:gtest_main", + ] } ohos_unittest("DevHostTest") { @@ -80,8 +82,6 @@ ohos_unittest("DevHostTest") { "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", "$hdf_uhdf_path/utils:libhdf_utils", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", ] if (is_standard_system) { @@ -92,6 +92,11 @@ ohos_unittest("DevHostTest") { } else { external_deps = [ "hilog:libhilog" ] } + + external_deps += [ + "googletest:gmock_main", + "googletest:gtest_main", + ] } ###########################end########################### diff --git a/adapter/uhdf2/osal/test/BUILD.gn b/adapter/uhdf2/osal/test/BUILD.gn index ea8f5e3f7..bb2bbb0c6 100644 --- a/adapter/uhdf2/osal/test/BUILD.gn +++ b/adapter/uhdf2/osal/test/BUILD.gn @@ -24,18 +24,13 @@ ohos_unittest("OsalTest") { sources = [ "unittest/common/osal_slist_test.cpp" ] include_dirs = [ - "//commonlibrary/c_utils/base/include", "$hdf_framework_path/include/osal", "$hdf_framework_path/include/utils", "$hdf_framework_path/utils/include", "unittest/common/", ] - deps = [ - "$hdf_uhdf_path/utils:libhdf_utils", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", - ] + deps = [ "$hdf_uhdf_path/utils:libhdf_utils" ] if (is_standard_system) { external_deps = [ @@ -45,6 +40,11 @@ ohos_unittest("OsalTest") { } else { external_deps = [ "hilog:libhilog" ] } + + external_deps += [ + "googletest:gmock_main", + "googletest:gtest_main", + ] } ###########################end########################### diff --git a/framework/model/network/wifi/core/module/wifi_base.c b/framework/model/network/wifi/core/module/wifi_base.c index 42007fec6..b0f722a19 100644 --- a/framework/model/network/wifi/core/module/wifi_base.c +++ b/framework/model/network/wifi/core/module/wifi_base.c @@ -6,7 +6,7 @@ * See the LICENSE file in the root of this repository for complete details. */ #include "wifi_base.h" -#include "../hdf_wifi_core.h" +#include "hdf_wifi_core.h" #include "eapol.h" #include "hdf_wifi_event.h" #include "hdf_wlan_chipdriver_manager.h" diff --git a/framework/model/network/wifi/platform/src/message/message_dispatcher.h b/framework/model/network/wifi/platform/include/message/message_dispatcher.h similarity index 100% rename from framework/model/network/wifi/platform/src/message/message_dispatcher.h rename to framework/model/network/wifi/platform/include/message/message_dispatcher.h diff --git a/framework/model/network/wifi/platform/src/message/message_router_inner.h b/framework/model/network/wifi/platform/include/message/message_router_inner.h similarity index 100% rename from framework/model/network/wifi/platform/src/message/message_router_inner.h rename to framework/model/network/wifi/platform/include/message/message_router_inner.h diff --git a/framework/model/network/wifi/platform/src/message/shared_obj.h b/framework/model/network/wifi/platform/include/message/shared_obj.h similarity index 100% rename from framework/model/network/wifi/platform/src/message/shared_obj.h rename to framework/model/network/wifi/platform/include/message/shared_obj.h diff --git a/framework/model/network/wifi/platform/src/message/nodes/local_node.c b/framework/model/network/wifi/platform/src/message/nodes/local_node.c index 6cdfba889..4e7bc89ca 100644 --- a/framework/model/network/wifi/platform/src/message/nodes/local_node.c +++ b/framework/model/network/wifi/platform/src/message/nodes/local_node.c @@ -10,7 +10,7 @@ #include "hdf_log.h" #include "hdf_wlan_priority_queue.h" #include "message/message_types.h" -#include "../message_router_inner.h" +#include "message_router_inner.h" #include "sidecar.h" #ifdef USERSPACE_CLIENT_SUPPORT diff --git a/framework/test/fuzztest/devmgr_cpp_fuzzer/loaddevice_fuzzer/BUILD.gn b/framework/test/fuzztest/devmgr_cpp_fuzzer/loaddevice_fuzzer/BUILD.gn index be553cff9..783482a06 100644 --- a/framework/test/fuzztest/devmgr_cpp_fuzzer/loaddevice_fuzzer/BUILD.gn +++ b/framework/test/fuzztest/devmgr_cpp_fuzzer/loaddevice_fuzzer/BUILD.gn @@ -22,7 +22,6 @@ ohos_fuzztest("LoadDeviceFuzzTest") { "$hdf_adapter_path/uhdf2/include/hdi", "$hdf_adapter_path/uhdf2/osal/include", "$hdf_framework_path/include/utils", - "//commonlibrary/c_utils/base/include", ] sources = [ "loaddevice_fuzzer.cpp" ] diff --git a/framework/test/fuzztest/devmgr_cpp_fuzzer/unloaddevice_fuzzer/BUILD.gn b/framework/test/fuzztest/devmgr_cpp_fuzzer/unloaddevice_fuzzer/BUILD.gn index e57cfae64..db59e986a 100644 --- a/framework/test/fuzztest/devmgr_cpp_fuzzer/unloaddevice_fuzzer/BUILD.gn +++ b/framework/test/fuzztest/devmgr_cpp_fuzzer/unloaddevice_fuzzer/BUILD.gn @@ -22,7 +22,6 @@ ohos_fuzztest("UnloadDeviceFuzzTest") { "$hdf_adapter_path/uhdf2/include/hdi", "$hdf_adapter_path/uhdf2/osal/include", "$hdf_framework_path/include/utils", - "//commonlibrary/c_utils/base/include", ] sources = [ "unloaddevice_fuzzer.cpp" ] diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioservicebind_fuzzer/BUILD.gn b/framework/test/fuzztest/ioservice_fuzzer/ioservicebind_fuzzer/BUILD.gn index b3c9bdb59..93d2b9c2d 100644 --- a/framework/test/fuzztest/ioservice_fuzzer/ioservicebind_fuzzer/BUILD.gn +++ b/framework/test/fuzztest/ioservice_fuzzer/ioservicebind_fuzzer/BUILD.gn @@ -18,7 +18,6 @@ ohos_fuzztest("IoserviceBindFuzzTest") { include_dirs = [ "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioservicebind_fuzzer.h", - "//commonlibrary/c_utils/base/include", ] sources = [ "ioservicebind_fuzzer.cpp" ] deps = [ "../../../../../adapter/uhdf2/utils:libhdf_utils" ] diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer/BUILD.gn b/framework/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer/BUILD.gn index 1e741368d..afcf1bde0 100644 --- a/framework/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer/BUILD.gn +++ b/framework/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer/BUILD.gn @@ -15,10 +15,7 @@ ohos_fuzztest("IoserviceGroupListenFuzzTest") { fuzz_config_file = "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer" - include_dirs = [ - "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer.h", - "//commonlibrary/c_utils/base/include", - ] + include_dirs = [ "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer.h" ] if (is_standard_system) { external_deps = [ "c_utils:utils", diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer/BUILD.gn b/framework/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer/BUILD.gn index 0ab7cdccc..d4705a188 100644 --- a/framework/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer/BUILD.gn +++ b/framework/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer/BUILD.gn @@ -15,10 +15,7 @@ ohos_fuzztest("IoserviceListenFuzzTest") { fuzz_config_file = "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer" - include_dirs = [ - "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer.h", - "//commonlibrary/c_utils/base/include", - ] + include_dirs = [ "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer.h" ] if (is_standard_system) { external_deps = [ "c_utils:utils", diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer/BUILD.gn b/framework/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer/BUILD.gn index 6698c9823..3d732c3bc 100644 --- a/framework/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer/BUILD.gn +++ b/framework/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer/BUILD.gn @@ -15,10 +15,7 @@ ohos_fuzztest("IoserviceRemoveFuzzTest") { fuzz_config_file = "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer" - include_dirs = [ - "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer.h", - "//commonlibrary/c_utils/base/include", - ] + include_dirs = [ "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer.h" ] if (is_standard_system) { external_deps = [ "c_utils:utils", diff --git a/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/BUILD.gn b/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/BUILD.gn index 049d18276..007088e3b 100644 --- a/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/BUILD.gn +++ b/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/BUILD.gn @@ -21,7 +21,6 @@ ohos_fuzztest("UnregisterServiceStatusListenerFuzzTest") { "$hdf_adapter_path/uhdf2/include/hdi", "$hdf_adapter_path/uhdf2/osal/include", "$hdf_framework_path/include/utils", - "//commonlibrary/c_utils/base/include", ] sources = [ "unregisterservicestatuslistener_fuzzer.cpp" ] -- Gitee