From 9299d691a8297f5f6dd64bbf3e15bb8a2025f142 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 17 Sep 2022 13:25:01 +0800 Subject: [PATCH 1/6] remove redundant deps for wifi 0917 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/BUILD.gn | 5 ----- wifi/frameworks/native/BUILD.gn | 2 -- .../wifi_framework/wifi_manage/BUILD.gn | 16 +--------------- .../wifi_framework/wifi_manage/wifi_ap/BUILD.gn | 3 --- .../wifi_framework/wifi_manage/wifi_p2p/BUILD.gn | 2 -- .../wifi_manage/wifi_scan/BUILD.gn | 1 - wifi/utils/BUILD.gn | 1 - 7 files changed, 1 insertion(+), 29 deletions(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index a5ac4ba6f..ff5f81ab3 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -41,7 +41,6 @@ ohos_shared_library("wifi") { ] deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", - "$WIFI_ROOT_DIR/utils:wifi_utils", "${ability_runtime_path}/frameworks/native/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", @@ -86,7 +85,6 @@ ohos_shared_library("wifiext") { ] external_deps = [ - "bundle_framework:appexecfwk_base", "c_utils:utils", "ipc:ipc_core", ] @@ -123,7 +121,6 @@ ohos_shared_library("wifi_native_js") { ] deps = [ "$WIFI_ROOT_DIR/frameworks/native:wifi_sdk", - "$WIFI_ROOT_DIR/utils:wifi_utils", "${ability_runtime_path}/frameworks/native/appkit:app_context", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/arkui/napi:ace_napi", @@ -133,9 +130,7 @@ ohos_shared_library("wifi_native_js") { external_deps = [ "access_token:libaccesstoken_sdk", - "bundle_framework:appexecfwk_base", "c_utils:utils", - "ipc:ipc_core", ] relative_install_dir = "module" diff --git a/wifi/frameworks/native/BUILD.gn b/wifi/frameworks/native/BUILD.gn index 2d21b94f5..4687ead25 100644 --- a/wifi/frameworks/native/BUILD.gn +++ b/wifi/frameworks/native/BUILD.gn @@ -205,9 +205,7 @@ if (defined(ohos_lite)) { ] external_deps = [ - "ability_base:want", "c_utils:utils", - "common_event_service:cesfwk_innerkits", "ipc:ipc_core", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 74ae1895d..dc26f2c24 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -177,6 +177,7 @@ if (defined(ohos_lite)) { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/frameworks/native/netmanagernative", "//foundation/communication/netmanager_base/interfaces/innerkits/netmanagernative/include", + "//foundation/communication/netmanager_base/interfaces/innerkits/netconnclient/include/proxy", ] } @@ -211,9 +212,6 @@ if (defined(ohos_lite)) { ] external_deps = [ - "ability_base:want", - "bundle_framework:appexecfwk_base", - "eventhandler:libeventhandler", "ipc:ipc_core", ] } @@ -244,10 +242,8 @@ if (defined(ohos_lite)) { deps = [ ":wifi_p2p_service_impl" ] external_deps = [ "ability_base:want", - "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "eventhandler:libeventhandler", "ipc:ipc_core", ] } @@ -269,9 +265,6 @@ if (defined(ohos_lite)) { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit" ] external_deps = [ - "ability_base:want", - "bundle_framework:appexecfwk_base", - "eventhandler:libeventhandler", "ipc:ipc_core", ] defines = [ @@ -296,13 +289,9 @@ if (defined(ohos_lite)) { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", - "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager", ] external_deps = [ - "ability_base:want", - "bundle_framework:appexecfwk_base", - "eventhandler:libeventhandler", "ipc:ipc_core", "netmanager_base:net_conn_manager_if", ] @@ -337,11 +326,9 @@ if (defined(ohos_lite)) { external_deps = [ "access_token:libaccesstoken_sdk", - "bundle_framework:appexecfwk_base", "c_utils:utils", "ipc:ipc_core", "netmanager_base:net_conn_manager_if", - "safwk:system_ability_fwk", "samgr:samgr_proxy", ] defines = [ @@ -382,7 +369,6 @@ if (defined(ohos_lite)) { deps = [ ":wifi_manager_service", ":wifi_scan_service_impl", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn index 68d335652..e808bca9d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn @@ -74,12 +74,9 @@ ohos_shared_library("wifi_ap_service") { ] deps = [ - "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", - "$WIFI_ROOT_DIR/utils:wifi_utils", ] defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn index e4035280d..742068eaa 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn @@ -105,7 +105,6 @@ ohos_shared_library("wifi_p2p_service") { external_deps = [ "c_utils:utils", "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", "netmanager_base:net_conn_manager_if", ] @@ -113,7 +112,6 @@ ohos_shared_library("wifi_p2p_service") { "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "$WIFI_ROOT_DIR/utils:wifi_utils", ] diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index 0c66f3206..557727103 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -89,7 +89,6 @@ if (defined(ohos_lite)) { ] deps = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", ] diff --git a/wifi/utils/BUILD.gn b/wifi/utils/BUILD.gn index f60cfee52..f3dc45bc5 100644 --- a/wifi/utils/BUILD.gn +++ b/wifi/utils/BUILD.gn @@ -65,7 +65,6 @@ if (defined(ohos_lite)) { external_deps = [ "ability_base:want", "ability_runtime:app_manager", - "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", "hisysevent_native:libhisysevent", -- Gitee From 67a878c7a8e3a946e1b5392699d79a14e81058e9 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 17 Sep 2022 14:13:49 +0800 Subject: [PATCH 2/6] remove redundant deps for wifi 0917 Signed-off-by: yanxiaotao@huawei.com --- wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index dc26f2c24..8824ba153 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -242,6 +242,7 @@ if (defined(ohos_lite)) { deps = [ ":wifi_p2p_service_impl" ] external_deps = [ "ability_base:want", + "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", "ipc:ipc_core", -- Gitee From 64cb2dbfd0ba416d30b664a57ed095b5366b10b4 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 17 Sep 2022 14:59:27 +0800 Subject: [PATCH 3/6] remove redundant deps for wifi 0917 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/BUILD.gn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index ff5f81ab3..78e10ac3b 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -85,6 +85,7 @@ ohos_shared_library("wifiext") { ] external_deps = [ + "bundle_framework:appexecfwk_base", "c_utils:utils", "ipc:ipc_core", ] @@ -130,7 +131,9 @@ ohos_shared_library("wifi_native_js") { external_deps = [ "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_base", "c_utils:utils", + "ipc:ipc_core", ] relative_install_dir = "module" -- Gitee From c1ebeb6589b10c4bf423a74163db73e28f4d9658 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Sat, 17 Sep 2022 15:02:55 +0800 Subject: [PATCH 4/6] remove redundant deps for wifi 0917 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/wifi/frameworks/js/napi/BUILD.gn b/wifi/frameworks/js/napi/BUILD.gn index 78e10ac3b..8fadc2863 100644 --- a/wifi/frameworks/js/napi/BUILD.gn +++ b/wifi/frameworks/js/napi/BUILD.gn @@ -87,7 +87,6 @@ ohos_shared_library("wifiext") { external_deps = [ "bundle_framework:appexecfwk_base", "c_utils:utils", - "ipc:ipc_core", ] relative_install_dir = "module" -- Gitee From bbca9d2b26ca95a53aba9a568aeb18f70936ffe8 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 19 Sep 2022 10:30:47 +0800 Subject: [PATCH 5/6] remove redundant deps for wifi 0917 Signed-off-by: yanxiaotao@huawei.com --- wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index 8824ba153..cf078b4ad 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -177,7 +177,6 @@ if (defined(ohos_lite)) { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//foundation/communication/netmanager_base/frameworks/native/netmanagernative", "//foundation/communication/netmanager_base/interfaces/innerkits/netmanagernative/include", - "//foundation/communication/netmanager_base/interfaces/innerkits/netconnclient/include/proxy", ] } -- Gitee From d5f6f54965b4579eaa1236970090072565bba39c Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 19 Sep 2022 10:46:37 +0800 Subject: [PATCH 6/6] remove redundant deps for wifi 0917 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/BUILD.gn | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index cf078b4ad..62f97cb91 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -210,9 +210,7 @@ if (defined(ohos_lite)) { ":wifi_manager_service_header", ] - external_deps = [ - "ipc:ipc_core", - ] + external_deps = [ "ipc:ipc_core" ] } ohos_source_set("wifi_device_service_impl") { part_name = "wifi" @@ -264,9 +262,7 @@ if (defined(ohos_lite)) { deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit" ] - external_deps = [ - "ipc:ipc_core", - ] + external_deps = [ "ipc:ipc_core" ] defines = [ "FEATURE_AP_SUPPORT", "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num", @@ -287,9 +283,7 @@ if (defined(ohos_lite)) { ":wifi_manager_service_header", ] - deps = [ - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", - ] + deps = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit" ] external_deps = [ "ipc:ipc_core", -- Gitee