From 1fb6d474da0be851dbe763154d464c8da803a4b4 Mon Sep 17 00:00:00 2001 From: hanhaibin Date: Thu, 10 Feb 2022 16:28:35 +0800 Subject: [PATCH] Fix atomic ability part name change Signed-off-by: hanhaibin --- adapter/ohos/capability/BUILD.gn | 4 ++-- adapter/ohos/entrance/BUILD.gn | 5 ++--- adapter/ohos/entrance/pa_engine/BUILD.gn | 3 +-- .../ohos/entrance/pa_engine/engine/jsi/BUILD.gn | 3 +-- .../entrance/pa_engine/engine/quickjs/BUILD.gn | 3 +-- adapter/ohos/services/uiservice/BUILD.gn | 1 - .../core/common/test/unittest/plugin/BUILD.gn | 5 ++--- frameworks/core/components/form/BUILD.gn | 2 +- frameworks/core/components/plugin/BUILD.gn | 3 +-- .../core/components/test/unittest/plugin/BUILD.gn | 14 +++++--------- interfaces/napi/kits/plugincomponent/BUILD.gn | 4 ++-- 11 files changed, 18 insertions(+), 29 deletions(-) diff --git a/adapter/ohos/capability/BUILD.gn b/adapter/ohos/capability/BUILD.gn index 81c7f65a..9ee6499c 100644 --- a/adapter/ohos/capability/BUILD.gn +++ b/adapter/ohos/capability/BUILD.gn @@ -27,8 +27,8 @@ template("ace_capability_ohos_source_set") { if (defined(config.enable_system_clipboard) && config.enable_system_clipboard) { - external_deps = [ - "ability_runtime:want", + external_deps += [ + "ability_base:want", "ipc:ipc_core", "pasteboard_native:pasteboard_client", ] diff --git a/adapter/ohos/entrance/BUILD.gn b/adapter/ohos/entrance/BUILD.gn index f5391c20..9c7a8f77 100644 --- a/adapter/ohos/entrance/BUILD.gn +++ b/adapter/ohos/entrance/BUILD.gn @@ -80,11 +80,10 @@ template("ace_ohos_standard_source_set") { [ "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr" ] external_deps = [ + "ability_base:base", + "ability_base:want", "ability_runtime:ability_context_native", "ability_runtime:ability_manager", - "ability_runtime:app_manager", - "ability_runtime:base", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "eventhandler:libeventhandler", diff --git a/adapter/ohos/entrance/pa_engine/BUILD.gn b/adapter/ohos/entrance/pa_engine/BUILD.gn index 9a9e9e47..92f601a1 100644 --- a/adapter/ohos/entrance/pa_engine/BUILD.gn +++ b/adapter/ohos/entrance/pa_engine/BUILD.gn @@ -49,8 +49,7 @@ template("pa_backend") { "//utils/native/base:utils", ] external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:want", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "eventhandler:libeventhandler", diff --git a/adapter/ohos/entrance/pa_engine/engine/jsi/BUILD.gn b/adapter/ohos/entrance/pa_engine/engine/jsi/BUILD.gn index 87ad262c..a707bf4e 100755 --- a/adapter/ohos/entrance/pa_engine/engine/jsi/BUILD.gn +++ b/adapter/ohos/entrance/pa_engine/engine/jsi/BUILD.gn @@ -79,8 +79,7 @@ template("js_pa_engine_ark") { "//utils/native/base:utils", ] external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:want", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "eventhandler:libeventhandler", diff --git a/adapter/ohos/entrance/pa_engine/engine/quickjs/BUILD.gn b/adapter/ohos/entrance/pa_engine/engine/quickjs/BUILD.gn index e158db73..1b0fc9d8 100644 --- a/adapter/ohos/entrance/pa_engine/engine/quickjs/BUILD.gn +++ b/adapter/ohos/entrance/pa_engine/engine/quickjs/BUILD.gn @@ -50,8 +50,7 @@ template("js_pa_engine_qjs") { "//utils/native/base:utils", ] external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:want", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "eventhandler:libeventhandler", diff --git a/adapter/ohos/services/uiservice/BUILD.gn b/adapter/ohos/services/uiservice/BUILD.gn index b7d02dd0..5b8c10db 100755 --- a/adapter/ohos/services/uiservice/BUILD.gn +++ b/adapter/ohos/services/uiservice/BUILD.gn @@ -101,7 +101,6 @@ template("uiservice_static") { external_deps = [ "ability_runtime:ability_manager", - "ability_runtime:app_manager", "ability_runtime:runtime", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/frameworks/core/common/test/unittest/plugin/BUILD.gn b/frameworks/core/common/test/unittest/plugin/BUILD.gn index 11a14126..0fde46f5 100644 --- a/frameworks/core/common/test/unittest/plugin/BUILD.gn +++ b/frameworks/core/common/test/unittest/plugin/BUILD.gn @@ -39,9 +39,8 @@ ohos_unittest("PluginManagerTest") { ] external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:base", - "ability_runtime:want", + "ability_base:base", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "eventhandler:libeventhandler", diff --git a/frameworks/core/components/form/BUILD.gn b/frameworks/core/components/form/BUILD.gn index 98652228..a86dbd3e 100644 --- a/frameworks/core/components/form/BUILD.gn +++ b/frameworks/core/components/form/BUILD.gn @@ -28,8 +28,8 @@ build_component("form") { if (is_standard_system) { external_deps = [ + "ability_base:want", "ability_runtime:app_manager", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "form_runtime:fmskit_native", diff --git a/frameworks/core/components/plugin/BUILD.gn b/frameworks/core/components/plugin/BUILD.gn index 46b97aed..eb53320b 100644 --- a/frameworks/core/components/plugin/BUILD.gn +++ b/frameworks/core/components/plugin/BUILD.gn @@ -48,8 +48,7 @@ build_component("plugin") { ] external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:want", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ipc:ipc_core", diff --git a/frameworks/core/components/test/unittest/plugin/BUILD.gn b/frameworks/core/components/test/unittest/plugin/BUILD.gn index 36bd6af9..6dd0fcf7 100644 --- a/frameworks/core/components/test/unittest/plugin/BUILD.gn +++ b/frameworks/core/components/test/unittest/plugin/BUILD.gn @@ -64,8 +64,7 @@ ohos_unittest("PluginCallBackClientTest") { ] external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:want", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ipc:ipc_core", @@ -98,8 +97,7 @@ ohos_unittest("PluginComponentTest") { ] external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:want", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ipc:ipc_core", @@ -132,8 +130,7 @@ ohos_unittest("PluginElementTest") { ] external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:want", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ipc:ipc_core", @@ -168,8 +165,7 @@ ohos_unittest("PluginManagerDelegateTest") { ] external_deps = [ - "ability_runtime:app_manager", - "ability_runtime:want", + "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ipc:ipc_core", @@ -222,7 +218,7 @@ ohos_unittest("PluginSubContainerTest") { "$ace_root/build:ace_ohos_unittest_base", ] - external_deps = [ "ability_runtime:want" ] + external_deps = [ "ability_base:want" ] if (!is_standard_system) { subsystem_name = "ace" diff --git a/interfaces/napi/kits/plugincomponent/BUILD.gn b/interfaces/napi/kits/plugincomponent/BUILD.gn index a9f8cffc..75afd711 100644 --- a/interfaces/napi/kits/plugincomponent/BUILD.gn +++ b/interfaces/napi/kits/plugincomponent/BUILD.gn @@ -45,9 +45,9 @@ ohos_shared_library("plugincomponent") { ] external_deps = [ + "ability_base:base", + "ability_base:want", "ability_runtime:app_manager", - "ability_runtime:base", - "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog",