From 6688eecc752c23800f858914665b8940ede099c1 Mon Sep 17 00:00:00 2001 From: junyi233 Date: Fri, 26 May 2023 03:25:27 +0000 Subject: [PATCH] =?UTF-8?q?deps=E4=BE=9D=E8=B5=96=E4=BA=86=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E5=A4=96=E7=9A=84=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E7=94=A8external=5Fdeps=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: junyi233 --- interfaces/inner_api/BUILD.gn | 3 +-- interfaces/kits/js/distributebundlemgr/BUILD.gn | 6 ++---- interfaces/kits/js/distributedBundle/BUILD.gn | 8 +++----- services/dbms/BUILD.gn | 6 ++---- .../dbms/test/unittest/dbms_services_kit_test/BUILD.gn | 6 ++---- .../dbms/test/unittest/distributed_bms_host_test/BUILD.gn | 2 +- test/fuzztest/distributedbmshost_fuzzer/BUILD.gn | 6 ++---- 7 files changed, 13 insertions(+), 24 deletions(-) diff --git a/interfaces/inner_api/BUILD.gn b/interfaces/inner_api/BUILD.gn index b32e0f5..c821bd9 100644 --- a/interfaces/inner_api/BUILD.gn +++ b/interfaces/inner_api/BUILD.gn @@ -28,11 +28,10 @@ ohos_shared_library("dbms_fwk") { public_configs = [ ":dbms_fwk_config" ] - deps = [ "${common_path}:libappexecfwk_common" ] - external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", + "bundle_framework:libappexecfwk_common", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/interfaces/kits/js/distributebundlemgr/BUILD.gn b/interfaces/kits/js/distributebundlemgr/BUILD.gn index 1ed9193..f9e0162 100644 --- a/interfaces/kits/js/distributebundlemgr/BUILD.gn +++ b/interfaces/kits/js/distributebundlemgr/BUILD.gn @@ -27,14 +27,12 @@ ohos_shared_library("distributedbundle") { configs = [ "${dbms_services_path}:distributed_bms_config" ] - deps = [ - "${common_path}:libappexecfwk_common", - "${dbms_inner_api_path}:dbms_fwk", - ] + deps = [ "${dbms_inner_api_path}:dbms_fwk" ] external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", + "bundle_framework:libappexecfwk_common", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/interfaces/kits/js/distributedBundle/BUILD.gn b/interfaces/kits/js/distributedBundle/BUILD.gn index 4607fa5..076925f 100644 --- a/interfaces/kits/js/distributedBundle/BUILD.gn +++ b/interfaces/kits/js/distributedBundle/BUILD.gn @@ -29,16 +29,14 @@ ohos_shared_library("distributedbundlemanager") { configs = [ "${dbms_services_path}:distributed_bms_config" ] - deps = [ - "${common_path}:libappexecfwk_common", - "${dbms_inner_api_path}:dbms_fwk", - "${kits_path}/js/common:bundle_napi_common", - ] + deps = [ "${dbms_inner_api_path}:dbms_fwk" ] external_deps = [ "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "bundle_framework:bundle_napi_common", + "bundle_framework:libappexecfwk_common", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/dbms/BUILD.gn b/services/dbms/BUILD.gn index 0fd9d83..bbf74cb 100644 --- a/services/dbms/BUILD.gn +++ b/services/dbms/BUILD.gn @@ -41,10 +41,7 @@ ohos_shared_library("libdbms") { configs = [ ":distributed_bms_config" ] - deps = [ - "${common_path}:libappexecfwk_common", - "${dbms_inner_api_path}:dbms_fwk", - ] + deps = [ "${dbms_inner_api_path}:dbms_fwk" ] external_deps = [ "ability_base:want", @@ -52,6 +49,7 @@ ohos_shared_library("libdbms") { "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "bundle_framework:libappexecfwk_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", "device_manager:devicemanagersdk", diff --git a/services/dbms/test/unittest/dbms_services_kit_test/BUILD.gn b/services/dbms/test/unittest/dbms_services_kit_test/BUILD.gn index ae7d581..3ed2987 100644 --- a/services/dbms/test/unittest/dbms_services_kit_test/BUILD.gn +++ b/services/dbms/test/unittest/dbms_services_kit_test/BUILD.gn @@ -35,10 +35,7 @@ ohos_unittest("DbmsServicesKitTest") { sources += [ "dbms_services_kit_test.cpp" ] - deps = [ - "${common_path}:libappexecfwk_common", - "${dbms_inner_api_path}:dbms_fwk", - ] + deps = [ "${dbms_inner_api_path}:dbms_fwk" ] external_deps = [ "ability_base:want", @@ -46,6 +43,7 @@ ohos_unittest("DbmsServicesKitTest") { "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "bundle_framework:libappexecfwk_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", "device_manager:devicemanagersdk", diff --git a/services/dbms/test/unittest/distributed_bms_host_test/BUILD.gn b/services/dbms/test/unittest/distributed_bms_host_test/BUILD.gn index fd327ec..9867751 100644 --- a/services/dbms/test/unittest/distributed_bms_host_test/BUILD.gn +++ b/services/dbms/test/unittest/distributed_bms_host_test/BUILD.gn @@ -31,7 +31,6 @@ ohos_unittest("DistributedBmsHostTest") { ] deps = [ - "${common_path}:libappexecfwk_common", "${dbms_inner_api_path}:dbms_fwk", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -43,6 +42,7 @@ ohos_unittest("DistributedBmsHostTest") { "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "bundle_framework:libappexecfwk_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", "device_manager:devicemanagersdk", diff --git a/test/fuzztest/distributedbmshost_fuzzer/BUILD.gn b/test/fuzztest/distributedbmshost_fuzzer/BUILD.gn index d923fdc..68caf6f 100644 --- a/test/fuzztest/distributedbmshost_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedbmshost_fuzzer/BUILD.gn @@ -33,15 +33,13 @@ ohos_fuzztest("DistributedBmsHostFuzzTest") { sources = [ "${dbms_services_path}/src/distributed_bms_host.cpp" ] sources += [ "distributedbmshost_fuzzer.cpp" ] - deps = [ - "${common_path}:libappexecfwk_common", - "${dbms_inner_api_path}:dbms_fwk", - ] + deps = [ "${dbms_inner_api_path}:dbms_fwk" ] external_deps = [ "ability_base:want", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "bundle_framework:libappexecfwk_common", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", -- Gitee