ISSU: https://gitee.com/openharmony/ability_ability_runtime/issues/I9KRVH

COMMENT:部件化治理

Signed-off-by: jiangzhijun8 <jiangzhijun7@huawei.com>

ability_runtime.gni

@@ -71,6 +71,19 @@ srms_inner_api_path =
     "${ability_runtime_path}/service_router_framework/interfaces/inner_api"
 fuzz_test_output_path = "ability_runtime/ability_runtime"
 accessibility_path = "//foundation/barrierfree/accessibility"
+relational_store_base_path = "//foundation/distributeddatamgr/relational_store"
+relational_store_napi_path = "${relational_store_base_path}/frameworks/js/napi"
+common_tool_path = "//foundation/distributeddatamgr/kv_store/frameworks/common"
+relational_store_common_path = "${relational_store_base_path}/frameworks/common"
+ability_base_path = "//foundation/ability/ability_base"
+ability_base_innerapi_path = "${ability_base_path}/interfaces/inner_api"
+relational_store_innerapi_path =
+    "${relational_store_base_path}/interfaces/inner_api"
+bgtaskmgr_root_path = "//foundation/resourceschedule/background_task_mgr"
+bgtaskmgr_interfaces_path = "${bgtaskmgr_root_path}/interfaces"
+bgtaskmgr_frameworks_path = "${bgtaskmgr_root_path}/frameworks"
+os_account_path = "//base/account/os_account"
+access_token_path = "//base/security/access_token"
 
 declare_args() {
   background_task_mgr_continuous_task_enable = true

bundle.json

@@ -83,7 +83,12 @@
             "storage_service",
             "toolchain",
             "webview",
-            "window_manager"
+            "window_manager",
+            "icu",
+            "jsoncpp",
+            "libuv",
+            "zlib",
+            "node"
   ],
           "third_party": [
             "icu",

frameworks/js/napi/ability_constant/BUILD.gn

@@ -18,9 +18,6 @@ ohos_shared_library("abilityconstant_napi") {
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "${ability_runtime_services_path}/common/include",
-    "${ability_base_kits_path}/uri/include",
-    "${ability_base_kits_path}/want/include",
-    "${ability_base_path}/interfaces/inner_api/base/include",
     "//third_party/json/include",
   ]
 
@@ -29,12 +26,13 @@ ohos_shared_library("abilityconstant_napi") {
   deps = []
 
   external_deps = [
+    "ability_base:zuri",
     "c_utils:utils",
     "hilog:libhilog",
     "ipc:ipc_core",
     "napi:ace_napi",
   ]
-
+  public_external_deps = [ "ability_base:want" ]
   relative_install_dir = "module/application"
   subsystem_name = "ability"
   part_name = "ability_runtime"
@@ -44,9 +42,6 @@ ohos_shared_library("abilityconstant") {
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "${ability_runtime_services_path}/common/include",
-    "${ability_base_kits_path}/uri/include",
-    "${ability_base_kits_path}/want/include",
-    "${ability_base_path}/interfaces/inner_api/base/include",
     "//third_party/json/include",
   ]
 
@@ -55,12 +50,13 @@ ohos_shared_library("abilityconstant") {
   deps = []
 
   external_deps = [
+    "ability_base:zuri",
     "c_utils:utils",
     "hilog:libhilog",
     "ipc:ipc_core",
     "napi:ace_napi",
   ]
-
+  public_external_deps = [ "ability_base:want" ]
   defines = [ "ENABLE_ERRCODE" ]
 
   relative_install_dir = "module/app/ability"

frameworks/js/napi/ability_manager/BUILD.gn

@@ -29,11 +29,7 @@ template("abilitymanager") {
       "js_ability_manager_utils.cpp",
     ]
 
-    include_dirs = [
-      "./",
-      "//third_party/icu/icu4c/source/common",
-      "${ipc_native_path}/src/napi/include",
-    ]
+    include_dirs = [ "./" ]
 
     deps = [
       "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
@@ -55,6 +51,7 @@ template("abilitymanager") {
       "common_event_service:cesfwk_innerkits",
       "eventhandler:libeventhandler",
       "hilog:libhilog",
+      "icu:shared_icuuc",
       "ipc:ipc_core",
       "ipc:ipc_napi",
       "napi:ace_napi",

frameworks/js/napi/app/ability_delegator/BUILD.gn

@@ -27,7 +27,6 @@ template("delegator") {
       "${ability_runtime_path}/interfaces/kits/native/appkit/ability_delegator/",
       "${ability_runtime_path}/interfaces/kits/native/ability/native",
       "${ability_runtime_path}/tools/aa/include",
-      "${ipc_native_path}/src/napi/include",
     ]
 
     sources = [

frameworks/js/napi/auto_fill_manager/BUILD.gn

@@ -13,7 +13,6 @@
 
 import("//build/ohos.gni")
 import("//foundation/ability/ability_runtime/ability_runtime.gni")
-import("//foundation/arkui/ace_engine/ace_config.gni")
 
 ohos_shared_library("autofillmanager_napi") {
   sources = [

frameworks/js/napi/featureAbility/BUILD.gn

@@ -13,7 +13,6 @@
 
 import("//build/ohos.gni")
 import("//foundation/ability/ability_runtime/ability_runtime.gni")
-import("//foundation/distributeddatamgr/relational_store/relational_store.gni")
 
 ohos_shared_library("featureability") {
   include_dirs = [ "./" ]
@@ -37,7 +36,6 @@ ohos_shared_library("featureability") {
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_native_path}/ability/native:data_ability_helper",
     "${ability_runtime_native_path}/appkit:appkit_native",
-    "//third_party/libuv:uv",
   ]
 
   external_deps = [
@@ -50,6 +48,7 @@ ohos_shared_library("featureability") {
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
+    "libuv:uv",
     "napi:ace_napi",
   ]
 

frameworks/js/napi/inner/napi_common/BUILD.gn

@@ -44,7 +44,6 @@ ohos_shared_library("napi_common") {
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:process_options",
     "${ability_runtime_innerkits_path}/runtime:runtime",
-    "//third_party/libuv:uv",
   ]
 
   external_deps = [
@@ -57,6 +56,7 @@ ohos_shared_library("napi_common") {
     "hilog:libhilog",
     "ipc:ipc_core",
     "ipc:ipc_napi",
+    "libuv:uv",
     "napi:ace_napi",
   ]
 

frameworks/js/napi/js_dialog_session/BUILD.gn

@@ -31,7 +31,6 @@ ohos_shared_library("dialogsession_napi") {
     "${ability_runtime_napi_path}/inner/napi_common:napi_common",
     "${ability_runtime_native_path}/appkit:app_context",
     "//third_party/json:nlohmann_json_static",
-    "//third_party/jsoncpp:jsoncpp",
   ]
 
   external_deps = [
@@ -45,6 +44,7 @@ ohos_shared_library("dialogsession_napi") {
     "hilog:libhilog",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
     "napi:ace_napi",
     "samgr:samgr_proxy",
   ]

frameworks/js/napi/js_mission_manager/BUILD.gn

@@ -46,9 +46,10 @@ ohos_shared_library("missionmanager") {
   ]
 
   if (ability_runtime_graphics) {
-    include_dirs += [ "//third_party/icu/icu4c/source/common" ]
+    include_dirs += []
     external_deps += [
       "graphic_2d:color_manager",
+      "icu:shared_icuuc",
       "image_framework:image",
     ]
     defines = [ "SUPPORT_GRAPHICS" ]

frameworks/js/napi/mission_manager/BUILD.gn

@@ -45,9 +45,10 @@ ohos_shared_library("missionmanager_napi") {
   ]
 
   if (ability_runtime_graphics) {
-    include_dirs += [ "//third_party/icu/icu4c/source/common" ]
+    include_dirs += []
     external_deps += [
       "graphic_2d:color_manager",
+      "icu:shared_icuuc",
       "image_framework:image",
     ]
     defines = [ "SUPPORT_GRAPHICS" ]
@@ -60,10 +61,7 @@ ohos_shared_library("missionmanager_napi") {
 }
 
 ohos_shared_library("distributedmissionmanager") {
-  include_dirs = [
-    "//third_party/libuv/include",
-    "//third_party/node/src",
-  ]
+  include_dirs = []
 
   configs = [ "${ability_runtime_services_path}/common:common_config" ]
 
@@ -96,7 +94,9 @@ ohos_shared_library("distributedmissionmanager") {
     "hilog:libhilog",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "libuv:uv",
     "napi:ace_napi",
+    "node:node_header_notice",
     "samgr:samgr_proxy",
   ]
 

frameworks/js/napi/particleAbility/BUILD.gn

@@ -13,15 +13,11 @@
 
 import("//build/ohos.gni")
 import("//foundation/ability/ability_runtime/ability_runtime.gni")
-import("//foundation/distributeddatamgr/relational_store/relational_store.gni")
 
 ohos_shared_library("particleability") {
   include_dirs = [
-    "//third_party/node/src",
     "${ability_runtime_napi_path}/featureAbility",
     "${ability_runtime_services_path}/common/include",
-    "//third_party/jsoncpp",
-    "//third_party/jsoncpp/include/json",
   ]
 
   sources = [
@@ -44,8 +40,6 @@ ohos_shared_library("particleability") {
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_native_path}/ability/native:data_ability_helper",
     "${ability_runtime_native_path}/appkit:appkit_native",
-    "//third_party/jsoncpp:jsoncpp",
-    "//third_party/libuv:uv",
   ]
 
   external_deps = [
@@ -58,7 +52,10 @@ ohos_shared_library("particleability") {
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
+    "libuv:uv",
     "napi:ace_napi",
+    "node:node_header_notice",
   ]
 
   if (ability_runtime_relational) {

frameworks/js/napi/wantagent/BUILD.gn

@@ -16,9 +16,7 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni")
 
 ohos_shared_library("wantagent") {
   include_dirs = [
-    "//third_party/node/src",
     "${ability_runtime_services_path}/common/include",
-    "//third_party/libuv/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime",
     "${ability_runtime_services_path}/abilitymgr/include",
     "./",
@@ -46,7 +44,9 @@ ohos_shared_library("wantagent") {
     "common_event_service:cesfwk_innerkits",
     "hilog:libhilog",
     "ipc:ipc_core",
+    "libuv:uv",
     "napi:ace_napi",
+    "node:node_header_notice",
   ]
 
   relative_install_dir = "module"

frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn

@@ -16,9 +16,7 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni")
 
 ohos_shared_library("wantagent_napi") {
   include_dirs = [
-    "//third_party/node/src",
     "${ability_runtime_services_path}/common/include",
-    "//third_party/libuv/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime",
     "${ability_runtime_services_path}/abilitymgr/include",
     "./",
@@ -47,7 +45,9 @@ ohos_shared_library("wantagent_napi") {
     "common_event_service:cesfwk_innerkits",
     "hilog:libhilog",
     "ipc:ipc_core",
+    "libuv:uv",
     "napi:ace_napi",
+    "node:node_header_notice",
   ]
 
   relative_install_dir = "module/app/ability"

frameworks/native/ability/BUILD.gn

@@ -24,7 +24,6 @@ config("ability_context_public_config") {
     "${user_file_service_innerkits_path}/file_access/*",
   ]
   include_dirs = [
-    "${ability_base_kits_path}/extractortool/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
     "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime",
     "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime/context",
@@ -83,7 +82,7 @@ ohos_shared_library("ability_context_native") {
     "ipc:ipc_core",
     "napi:ace_napi",
   ]
-
+  public_external_deps = [ "ability_base:extractortool" ]
   if (ability_runtime_graphics) {
     external_deps += [
       "ace_engine:ace_uicontent",

frameworks/native/ability/native/BUILD.gn

@@ -13,7 +13,6 @@
 
 import("//build/ohos.gni")
 import("//foundation/ability/ability_runtime/ability_runtime.gni")
-import("//foundation/distributeddatamgr/relational_store/relational_store.gni")
 
 config("ability_config") {
   visibility = [ ":*" ]
@@ -38,9 +37,7 @@ config("ability_config") {
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
-    "${form_fwk_path}/interfaces/kits/native/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
-    "//third_party/node/src",
     "${ability_runtime_innerkits_path}/ability_manager/include/continuation",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app/task",
     "${ability_runtime_napi_path}/inner/napi_common",
@@ -89,12 +86,9 @@ config("ability_public_config") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime",
     "${ability_runtime_path}/interfaces/kits/native/ability/native/recovery/",
-    "${accessibility_path}/interfaces/innerkits/common/include/",
-    "//third_party/libuv/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
     "${ability_runtime_innerkits_path}/ability_manager/include/continuation",
     "${ability_runtime_services_path}/common/include",
-    "//third_party/jsoncpp/include",
     "//third_party/json/include",
   ]
 
@@ -121,20 +115,11 @@ config("abilitykit_utils_public_config") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${bundlefwk_inner_api_path}/appexecfwk_base/include",
-    "${bundlefwk_inner_api_path}/appexecfwk_core/include/bundlemgr",
-    "//third_party/jsoncpp/include",
     "//third_party/json/include",
   ]
 
   if (ability_runtime_graphics) {
-    include_dirs += [
-      "${form_fwk_path}/interfaces/inner_api/include",
-      "${graphic_path}/utils/color_manager/export",
-      "${multimedia_path}/interfaces/innerkits/include",
-      "${windowmanager_path}/interfaces/innerkits/wm",
-      "${windowmanager_path}/interfaces/innerkits/dm",
-      "${windowmanager_path}/utils/include",
-    ]
+    include_dirs += []
     defines = [ "SUPPORT_GRAPHICS" ]
   }
 }
@@ -162,8 +147,6 @@ ohos_shared_library("abilitykit_utils") {
   external_deps = [
     "ability_base:configuration",
     "ability_base:want",
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
@@ -171,14 +154,25 @@ ohos_shared_library("abilitykit_utils") {
     "napi:ace_napi",
     "resource_management:global_resmgr",
   ]
+  public_external_deps = [
+    "bundle_framework:appexecfwk_core",
+    "jsoncpp:jsoncpp",
+    "window_manager:libwm",
+  ]
 
   if (ability_runtime_graphics) {
     deps += [ "//third_party/icu/icu4c:shared_icuuc" ]
     external_deps += [
       "ability_base:session_info",
-      "window_manager:libdm",
       "window_manager:libwm",
     ]
+    public_external_deps += [
+      "form_fwk:form_manager",
+      "graphic_2d:color_manager",
+      "image_framework:image_native",
+      "window_manager:libdm",
+      "window_manager:libwmutil",
+    ]
   }
 
   innerapi_tags = [ "platformsdk" ]
@@ -187,13 +181,7 @@ ohos_shared_library("abilitykit_utils") {
 }
 
 ohos_shared_library("abilitykit_native") {
-  include_dirs = [
-    "${ability_base_kits_path}/extractortool/include",
-    "${ability_runtime_path}/utils/global/time/include",
-    "${relational_store_napi_path}/rdb/include",
-    "${relational_store_napi_path}/common/include",
-    "${relational_store_napi_path}/dataability/include",
-  ]
+  include_dirs = [ "${ability_runtime_path}/utils/global/time/include" ]
 
   sources = [
     "${ability_runtime_innerkits_path}/app_manager/src/appmgr/process_info.cpp",
@@ -260,6 +248,7 @@ ohos_shared_library("abilitykit_native") {
   external_deps = [
     "ability_base:base",
     "ability_base:configuration",
+    "ability_base:extractortool",
     "ability_base:session_info",
     "ability_base:want",
     "ability_base:zuri",
@@ -277,11 +266,16 @@ ohos_shared_library("abilitykit_native") {
     "ipc:ipc_napi",
     "ipc:rpc",
     "napi:ace_napi",
+    "node:node_header_notice",
     "relational_store:native_rdb",
     "resource_management:global_resmgr",
     "samgr:samgr_proxy",
   ]
-
+  public_external_deps = [
+    "accessibility:accessibility_common",
+    "jsoncpp:jsoncpp",
+    "libuv:uv",
+  ]
   defines = []
 
   if (background_task_mgr_continuous_task_enable) {
@@ -338,18 +332,12 @@ config("extensionkit_public_config") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${bundlefwk_inner_api_path}/appexecfwk_base/include",
-    "${bundlefwk_inner_api_path}/appexecfwk_core/include/bundlemgr",
-    "//third_party/jsoncpp/include",
     "//third_party/json/include",
   ]
 
   if (ability_runtime_graphics) {
     include_dirs += [
-      "${form_fwk_path}/interfaces/inner_api/include",
-      "${graphic_path}/utils/color_manager/export",
-      "${multimedia_path}/interfaces/innerkits/include",
       "${windowmanager_path}/interfaces/innerkits/wm",
-      "${windowmanager_path}/interfaces/innerkits/dm",
       "${windowmanager_path}/utils/include",
     ]
     defines = [ "SUPPORT_GRAPHICS" ]
@@ -394,11 +382,20 @@ ohos_shared_library("extensionkit_native") {
     "hitrace:hitrace_meter",
     "napi:ace_napi",
   ]
-
+  public_external_deps = [
+    "bundle_framework:appexecfwk_core",
+    "jsoncpp:jsoncpp",
+  ]
   public_deps = [ ":abilitykit_utils" ]
 
   if (ability_runtime_graphics) {
     external_deps += [ "ability_base:session_info" ]
+    public_external_deps += [
+      "form_fwk:form_manager",
+      "graphic_2d:color_manager",
+      "image_framework:image_native",
+      "window_manager:libdm",
+    ]
   }
 
   innerapi_tags = [ "platformsdk" ]
@@ -457,20 +454,11 @@ config("uiability_config") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${ability_runtime_services_path}/abilitymgr/include",
-    "${arkui_path}/napi",
-    "${arkui_path}/napi/interfaces/kits",
     "${bundlefwk_inner_api_path}/appexecfwk_base/include",
-    "${bundlefwk_inner_api_path}/appexecfwk_core/include/bundlemgr",
-    "//third_party/libuv/include",
-    "//third_party/node/src",
   ]
 
   if (ability_runtime_graphics) {
     include_dirs += [
-      "${form_fwk_path}/interfaces/inner_api/include",
-      "${graphic_path}/utils/color_manager/export",
-      "${multimedia_path}/interfaces/innerkits/include",
-      "${windowmanager_path}/interfaces/innerkits/dm",
       "${windowmanager_path}/interfaces/innerkits/wm",
       "${windowmanager_path}/utils/include",
     ]
@@ -530,19 +518,29 @@ ohos_shared_library("uiabilitykit_native") {
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "ipc:ipc_napi",
-    "napi:ace_napi",
     "resource_management:global_resmgr",
   ]
+  public_external_deps = [
+    "bundle_framework:appexecfwk_core",
+    "libuv:uv",
+    "napi:ace_napi",
+    "node:node_header_notice",
+  ]
 
   if (ability_runtime_graphics) {
     deps += [ "//third_party/icu/icu4c:shared_icuuc" ]
     external_deps += [
       "ability_base:session_info",
-      "window_manager:libdm",
       "window_manager:libwm",
       "window_manager:libwsutils",
       "window_manager:windowstage_kit",
     ]
+    public_external_deps += [
+      "form_fwk:form_manager",
+      "graphic_2d:color_manager",
+      "image_framework:image_native",
+      "window_manager:libdm",
+    ]
   }
 
   innerapi_tags = [ "platformsdk" ]
@@ -765,8 +763,13 @@ ohos_shared_library("continuation_ipc") {
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",
+    "node:node_header_notice",
     "resource_management:global_resmgr",
   ]
+  public_external_deps = [
+    "accessibility:accessibility_common",
+    "libuv:uv",
+  ]
 
   defines = []
 
@@ -790,8 +793,8 @@ ohos_shared_library("data_ability_helper") {
     "${ability_runtime_native_path}/ability/native/data_ability_helper.cpp",
   ]
 
-  configs = [ ":ability_config" ]
-  public_configs = [ ":ability_public_config" ]
+  configs = []
+  public_configs = []
 
   deps = [ ":abilitykit_native" ]
 

frameworks/native/appkit/BUILD.gn

@@ -55,21 +55,16 @@ config("appkit_config") {
 config("appkit_public_config") {
   visibility = [ ":*" ]
   include_dirs = [
-    "${ability_base_kits_path}/configuration/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_delegator",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${ability_runtime_path}/interfaces/kits/native/appkit/dfr",
-    "${global_path}/resource_management/interfaces/inner_api/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper",
   ]
 
   if (ability_runtime_graphics) {
-    include_dirs += [
-      "${global_path}/i18n/frameworks/intl/include",
-      "//third_party/icu/icu4c/source/common",
-    ]
+    include_dirs += []
 
     defines = [
       "SUPPORT_GRAPHICS",
@@ -173,7 +168,6 @@ ohos_shared_library("appkit_native") {
 
   external_deps = [
     "ability_base:base",
-    "ability_base:configuration",
     "ability_base:extractresourcemanager",
     "ability_base:string_utils",
     "ability_base:want",
@@ -198,13 +192,15 @@ ohos_shared_library("appkit_native") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]
+  public_external_deps = [ "ability_base:configuration" ]
 
   if (ability_runtime_graphics) {
-    deps += [ "//third_party/icu/icu4c:shared_icuuc" ]
+    deps += []
     external_deps += [
       "ace_engine:ace_forward_compatibility",
       "graphic_2d:librender_service_client",
       "i18n:intl_util",
+      "icu:shared_icuuc",
       "window_manager:libwm",
     ]
   }
@@ -238,7 +234,6 @@ ohos_shared_library("appkit_native") {
 # build so
 ohos_shared_library("app_context") {
   include_dirs = [
-    "${ability_base_kits_path}/extractortool/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper",
@@ -270,7 +265,7 @@ ohos_shared_library("app_context") {
   ]
 
   external_deps = [
-    "ability_base:configuration",
+    "ability_base:extractortool",
     "ability_base:want",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
@@ -283,10 +278,14 @@ ohos_shared_library("app_context") {
     "resource_management:global_resmgr",
     "samgr:samgr_proxy",
   ]
+  public_external_deps = [ "ability_base:configuration" ]
 
   if (ability_runtime_graphics) {
-    deps += [ "//third_party/icu/icu4c:shared_icuuc" ]
-    external_deps += [ "i18n:intl_util" ]
+    deps += []
+    external_deps += [
+      "i18n:intl_util",
+      "icu:shared_icuuc",
+    ]
   }
 
   innerapi_tags = [ "platformsdk" ]
@@ -339,10 +338,13 @@ ohos_shared_library("app_context_utils") {
     "resource_management:global_resmgr",
     "resource_management:resmgr_napi_core",
   ]
-
+  public_external_deps = [ "ability_base:configuration" ]
   if (ability_runtime_graphics) {
-    deps += [ "//third_party/icu/icu4c:shared_icuuc" ]
-    external_deps += [ "i18n:intl_util" ]
+    deps += []
+    external_deps += [
+      "i18n:intl_util",
+      "icu:shared_icuuc",
+    ]
   }
 
   innerapi_tags = [ "platformsdk" ]
@@ -401,9 +403,10 @@ ohos_shared_library("appkit_delegator") {
     "ipc:ipc_core",
     "napi:ace_napi",
   ]
-
+  public_external_deps = [ "ability_base:configuration" ]
   if (ability_runtime_graphics) {
-    deps += [ "//third_party/icu/icu4c:shared_icuuc" ]
+    deps += []
+    external_deps += [ "icu:shared_icuuc" ]
   }
 
   innerapi_tags = [ "platformsdk" ]
@@ -449,7 +452,8 @@ ohos_shared_library("appkit_manager_helper") {
   ]
 
   if (ability_runtime_graphics) {
-    deps += [ "//third_party/icu/icu4c:shared_icuuc" ]
+    deps += []
+    external_deps += [ "icu:shared_icuuc" ]
   }
 
   innerapi_tags = [ "platformsdk" ]

interfaces/inner_api/ability_manager/BUILD.gn

@@ -26,20 +26,14 @@ config("ability_manager_public_config") {
   include_dirs = [
     "include/",
     "include/status_bar_delegate",
-    "${eventhandler_path}/interfaces/inner_api",
-    "${ability_base_kits_path}/configuration/include",
-    "${ability_base_kits_path}/uri/include",
-    "${ability_base_kits_path}/want/include",
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
     "${bundlefwk_inner_api_path}/appexecfwk_base/include",
-    "${bundlefwk_inner_api_path}/appexecfwk_core/include/bundlemgr",
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${ability_runtime_path}/interfaces/kits/native/appkit/dfr",
     "${ability_runtime_path}/interfaces/kits/native/appkit",
     "${ability_runtime_innerkits_path}/dataobs_manager/include",
-    "//third_party/jsoncpp/include",
   ]
 
   defines = []
@@ -139,16 +133,11 @@ ohos_shared_library("ability_manager") {
     ":mission_info",
     ":process_options",
     "${ability_runtime_innerkits_path}/app_manager:app_manager",
-    "//third_party/jsoncpp:jsoncpp",
   ]
 
   external_deps = [
     "ability_base:base",
-    "ability_base:configuration",
-    "ability_base:want",
-    "ability_base:zuri",
     "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
     "bundle_framework:libappexecfwk_common",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
@@ -161,6 +150,13 @@ ohos_shared_library("ability_manager") {
     "relational_store:native_rdb",
     "samgr:samgr_proxy",
   ]
+  public_external_deps = [
+    "ability_base:configuration",
+    "ability_base:want",
+    "ability_base:zuri",
+    "bundle_framework:appexecfwk_core",
+    "jsoncpp:jsoncpp",
+  ]
 
   if (ability_runtime_graphics) {
     deps += []
@@ -196,11 +192,16 @@ ohos_shared_library("mission_info") {
   public_configs = [ ":ability_manager_public_config" ]
 
   external_deps = [
-    "ability_base:want",
     "c_utils:utils",
     "ipc:ipc_core",
   ]
-
+  public_external_deps = [
+    "ability_base:configuration",
+    "ability_base:want",
+    "ability_base:zuri",
+    "bundle_framework:appexecfwk_core",
+    "jsoncpp:jsoncpp",
+  ]
   if (ability_runtime_graphics) {
     external_deps += [ "image_framework:image_native" ]
   }
@@ -231,7 +232,13 @@ ohos_shared_library("ability_start_setting") {
   public_configs = [ ":ability_manager_public_config" ]
 
   external_deps = [ "c_utils:utils" ]
-
+  public_external_deps = [
+    "ability_base:configuration",
+    "ability_base:want",
+    "ability_base:zuri",
+    "bundle_framework:appexecfwk_core",
+    "jsoncpp:jsoncpp",
+  ]
   cflags_cc = []
   innerapi_tags = [ "platformsdk" ]
   subsystem_name = "ability"
@@ -284,12 +291,17 @@ ohos_shared_library("ability_connect_callback_stub") {
   public_configs = [ ":ability_manager_public_config" ]
 
   external_deps = [
-    "ability_base:want",
-    "ability_base:zuri",
     "c_utils:utils",
     "hilog:libhilog",
     "ipc:ipc_core",
   ]
+  public_external_deps = [
+    "ability_base:configuration",
+    "ability_base:want",
+    "ability_base:zuri",
+    "bundle_framework:appexecfwk_core",
+    "jsoncpp:jsoncpp",
+  ]
 
   cflags_cc = []
   innerapi_tags = [

interfaces/inner_api/app_manager/BUILD.gn

@@ -12,18 +12,14 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//foundation/ability/ability_base/ability_base.gni")
 import("//foundation/ability/ability_runtime/ability_runtime.gni")
 
 config("appmgr_sdk_config") {
   include_dirs = [
     "include/appmgr",
-    "${ability_base_innerapi_path}/log/include",
     "${ability_base_kits_path}/configuration/include",
-    "${ability_base_kits_path}/want/include",
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
     "${ability_runtime_innerkits_path}/ability_manager/include",
-    "${bundlefwk_inner_api_path}/appexecfwk_base/include",
   ]
   defines = []
   if (ability_command_for_test) {
@@ -126,8 +122,6 @@ ohos_shared_library("app_manager") {
 
   external_deps = [
     "ability_base:configuration",
-    "ability_base:want",
-    "bundle_framework:appexecfwk_base",
     "c_utils:utils",
     "faultloggerd:libdfx_dumpcatcher",
     "faultloggerd:libfaultloggerd",
@@ -139,6 +133,10 @@ ohos_shared_library("app_manager") {
     "ipc:ipc_core",
     "samgr:samgr_proxy",
   ]
+  public_external_deps = [
+    "ability_base:want",
+    "bundle_framework:appexecfwk_base",
+  ]
 
   if (background_task_mgr_continuous_task_enable) {
     defines += [ "BGTASKMGR_CONTINUOUS_TASK_ENABLE" ]

interfaces/inner_api/connectionobs_manager/BUILD.gn

@@ -23,8 +23,6 @@ config("connection_obs_manager_public_config") {
   include_dirs = [
     "include",
     "${ability_runtime_services_path}/common/include",
-    "${safwk_path}/native/include",
-    "${bundlefwk_inner_api_path}/appexecfwk_base/include",
   ]
   cflags = []
   if (target_cpu == "arm") {
@@ -56,7 +54,7 @@ ohos_shared_library("connection_obs_manager") {
     "ipc:ipc_core",
     "samgr:samgr_proxy",
   ]
-
+  public_external_deps = [ "bundle_framework:appexecfwk_base" ]
   innerapi_tags = [ "platformsdk" ]
   subsystem_name = "ability"
   part_name = "ability_runtime"

interfaces/inner_api/dataobs_manager/BUILD.gn

@@ -18,10 +18,8 @@ config("dataobs_manager_public_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "include/",
-    "${safwk_path}/native/include",
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
     "${ability_runtime_services_path}/dataobsmgr/include",
-    "${ability_base_kits_path}/uri/include",
   ]
   cflags = []
   if (target_cpu == "arm") {
@@ -46,13 +44,12 @@ ohos_shared_library("dataobs_manager") {
   deps = []
 
   external_deps = [
-    "ability_base:zuri",
     "c_utils:utils",
     "hilog:libhilog",
     "ipc:ipc_core",
     "samgr:samgr_proxy",
   ]
-
+  public_external_deps = [ "ability_base:zuri" ]
   innerapi_tags = [
     "platformsdk",
     "sasdk",

interfaces/inner_api/runtime/BUILD.gn

@@ -87,8 +87,6 @@ ohos_shared_library("runtime") {
     "${ability_runtime_native_path}/ability/native:ability_business_error",
     "${ability_runtime_native_path}/appkit:appkit_manager_helper",
     "${ability_runtime_path}/js_environment/frameworks/js_environment:js_environment",
-    "${third_party_path}/jsoncpp:jsoncpp",
-    "${third_party_path}/zlib:shared_libz",
   ]
 
   external_deps = [
@@ -112,9 +110,11 @@ ohos_shared_library("runtime") {
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
     "napi:ace_napi",
     "resource_management:global_resmgr",
     "samgr:samgr_proxy",
+    "zlib:shared_libz",
   ]
 
   defines = []

interfaces/inner_api/wantagent/BUILD.gn

@@ -30,20 +30,16 @@ config("wantagent_innerkits_public_config") {
   ]
 
   include_dirs = [
-    "${eventhandler_path}/interfaces/inner_api",
     "${ability_base_kits_path}/configuration/include",
-    "${global_path}/resource_management/interfaces/inner_api/include",
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "${ability_runtime_innerkits_path}/wantagent/include",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
-    "${bundlefwk_inner_api_path}/appexecfwk_base/include",
     "${bundlefwk_inner_api_path}/appexecfwk_core/include/bundlemgr",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${ability_runtime_path}/interfaces/kits/native/appkit",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime",
-    "//third_party/icu/icu4c/source/common",
   ]
 }
 
@@ -85,6 +81,13 @@ ohos_shared_library("wantagent_innerkits") {
     "napi:ace_napi",
     "samgr:samgr_proxy",
   ]
+  public_external_deps = [
+    "bundle_framework:appexecfwk_base",
+    "eventhandler:libeventhandler",
+    "icu:shared_icuuc",
+    "image_framework:image_native",
+    "resource_management:global_resmgr",
+  ]
 
   if (is_double_framework) {
     cflags = [ "-DCONFIG_DUAL_FRAMEWORK" ]

services/abilitymgr/BUILD.gn

@@ -11,13 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//base/account/os_account/os_account.gni")
 import("//build/ohos.gni")
 import("//foundation/ability/ability_runtime/ability_runtime.gni")
 import(
     "//foundation/ability/ability_runtime/services/abilitymgr/abilitymgr.gni")
-import("//foundation/distributeddatamgr/relational_store/relational_store.gni")
-import("//foundation/resourceschedule/background_task_mgr/bgtaskmgr.gni")
 
 group("abilityms_target") {
   deps = [
@@ -38,28 +35,19 @@ config("abilityms_config") {
     "${ability_runtime_innerkits_path}/app_manager/include",
     "${ability_runtime_innerkits_path}/connectionobs_manager/include",
     "${ability_runtime_innerkits_path}/deps_wrapper/include",
-    "${ability_base_path}/interfaces/inner_api/base/include",
-    "${ability_base_kits_path}/extractortool/include",
-    "${ability_base_kits_path}/uri/include",
-    "${ability_base_kits_path}/want/include",
     "${ability_runtime_services_path}/common/include",
     "//prebuilts/jdk/jdk8/linux-x86/include",
     "//prebuilts/jdk/jdk8/linux-x86/include/linux",
     "//third_party/json/include",
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
     "${relational_store_innerapi_path}/rdb/include",
-    "${relational_store_innerapi_path}/appdatafwk/include",
     "${relational_store_innerapi_path}/dataability/include",
     "${ability_runtime_innerkits_path}/dataobs_manager/include",
     "${ability_runtime_path}/tools/aa/include",
-    "${os_account_path}/frameworks/common/account_error/include",
-    "${os_account_path}/frameworks/common/database/include",
-    "${os_account_path}/interfaces/innerkits/osaccount/native/include",
     "${ability_runtime_innerkits_path}/wantagent/include",
     "${ability_runtime_innerkits_path}/session_handler/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper",
-    "${bgtaskmgr_interfaces_path}/innerkits/include",
     "${bgtaskmgr_frameworks_path}/common/include",
     "${bgtaskmgr_frameworks_path}/include",
     "${init_path}/interfaces/innerkits/include/syspara/",
@@ -141,12 +129,12 @@ ohos_shared_library("abilityms") {
     "${ability_runtime_services_path}/common:event_report",
     "${ability_runtime_services_path}/common:perm_verification",
     "${ability_runtime_services_path}/common:task_handler_wrap",
-    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   external_deps = [
     "ability_base:base",
     "ability_base:configuration",
+    "ability_base:extractortool",
     "ability_base:session_info",
     "ability_base:view_data",
     "ability_base:want",
@@ -166,10 +154,13 @@ ohos_shared_library("abilityms") {
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
+    "icu:shared_icuuc",
     "init:libbeget_proxy",
     "init:libbegetutil",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "os_account:os_account_innerkits",
+    "relational_store:native_appdatafwk",
     "relational_store:native_dataability",
     "relational_store:native_rdb",
     "safwk:system_ability_fwk",
@@ -180,6 +171,7 @@ ohos_shared_library("abilityms") {
     "window_manager:session_manager_lite",
     "window_manager:sms",
   ]
+  public_external_deps = [ "background_task_mgr:bgtaskmgr_innerkits" ]
 
   if (background_task_mgr_continuous_task_enable) {
     external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ]
@@ -199,11 +191,12 @@ ohos_shared_library("abilityms") {
   }
 
   if (ability_runtime_graphics) {
-    deps += [ "//third_party/icu/icu4c:shared_icuuc" ]
+    deps += []
 
     external_deps += [
       "ability_base:session_info",
       "i18n:intl_util",
+      "icu:shared_icuuc",
       "image_framework:image_native",
       "input:libmmi-client",
       "resource_management:global_resmgr",

services/appmgr/BUILD.gn

@@ -23,7 +23,6 @@ config("appmgr_config") {
     "${ability_runtime_services_path}/common/include",
     "${ability_runtime_path}/tools/aa/include",
     "${ability_runtime_path}/utils/global/time/include",
-    "${distributeddatamgr_path}/kv_store/interfaces/innerkits/distributeddatamgr/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper",
   ]
 }
@@ -128,7 +127,7 @@ ohos_shared_library("libappms") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]
-
+  public_external_deps = [ "kv_store:distributeddata_mgr" ]
   if (product_name != "ohcore") {
     external_deps += [ "netmanager_base:net_conn_manager_if" ]
   }

test/mock/services_abilitymgr_test/appmgr_test_service/BUILD.gn

@@ -19,7 +19,6 @@ config("appmgr_test_service_config") {
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/appmgr_test_service/include/",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_innerkits_path}/ability_manager/include",
-    "${bundlefwk_inner_api_path}/appexecfwk_core/include",
     "${ability_runtime_innerkits_path}/app_manager/include",
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
     "${ability_runtime_services_path}/common/include",
@@ -29,9 +28,7 @@ config("appmgr_test_service_config") {
 ohos_source_set("appmgr_test_service") {
   include_dirs = [
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/system_ability_mock",
-    "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit/include",
-    "//third_party/jsoncpp/include",
   ]
 
   sources = [ "src/appmgr_test_service.cpp" ]
@@ -41,10 +38,7 @@ ohos_source_set("appmgr_test_service") {
   if (target_cpu == "arm") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
-  deps = [
-    "${ability_runtime_innerkits_path}/app_manager:app_manager",
-    "//third_party/jsoncpp:jsoncpp",
-  ]
+  deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager" ]
 
   if (ability_runtime_graphics) {
   }
@@ -58,7 +52,10 @@ ohos_source_set("appmgr_test_service") {
     "hilog:libhilog",
     "ipc:ipc_core",
   ]
-
+  public_external_deps = [
+    "jsoncpp:jsoncpp",
+    "samgr:samgr_proxy",
+  ]
   subsystem_name = "ability"
   part_name = "ability_runtime"
 }

test/mock/services_abilitymgr_test/libs/aakit/BUILD.gn

@@ -22,12 +22,11 @@ config("aakit_mock_config") {
     "${ability_runtime_innerkits_path}/app_manager/include",
     "${ability_runtime_path}/interfaces/kits/native/ability/native/",
     "include/",
-    "//third_party/jsoncpp/include",
     "${ability_runtime_services_path}/common/include/",
   ]
 }
 
-ohos_source_set("aakit_mock") {
+ohos_static_library("aakit_mock") {
   sources = [
     "src/ability_scheduler.cpp",
     "src/mock_ability_connect_callback.cpp",
@@ -38,12 +37,7 @@ ohos_source_set("aakit_mock") {
   if (target_cpu == "arm") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
-  deps = [
-    "${ability_runtime_innerkits_path}/app_manager:app_manager",
-    "${distributedschedule_path}/safwk/interfaces/innerkits/safwk:system_ability_fwk",
-    "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
-    "//third_party/jsoncpp:jsoncpp",
-  ]
+  deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager" ]
   external_deps = [
     "ability_base:base",
     "ability_base:configuration",
@@ -54,7 +48,11 @@ ohos_source_set("aakit_mock") {
     "c_utils:utils",
     "ffrt:libffrt",
     "hilog:libhilog",
+    "image_framework:image_native",
     "ipc:ipc_core",
+    "jsoncpp:jsoncpp",
+    "safwk:system_ability_fwk",
+    "samgr:samgr_proxy",
   ]
 
   subsystem_name = "ability"

test/mock/services_abilitymgr_test/libs/appexecfwk_core/BUILD.gn

@@ -28,7 +28,7 @@ config("appexecfwk_core_mock_config") {
   ]
 }
 
-ohos_source_set("appexecfwk_appmgr_mock") {
+ohos_static_library("appexecfwk_appmgr_mock") {
   # sources = [ "src/appmgr/mock_app_manager.cpp" ]
 
   configs = [ ":appexecfwk_core_mock_config" ]
@@ -36,11 +36,7 @@ ohos_source_set("appexecfwk_appmgr_mock") {
   if (target_cpu == "arm") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
-  deps = [
-    "${ability_runtime_innerkits_path}/app_manager:app_manager",
-    "${distributedschedule_path}/safwk/interfaces/innerkits/safwk:system_ability_fwk",
-    "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
-  ]
+  deps = [ "${ability_runtime_innerkits_path}/app_manager:app_manager" ]
 
   external_deps = [
     "bundle_framework:appexecfwk_base",
@@ -49,6 +45,8 @@ ohos_source_set("appexecfwk_appmgr_mock") {
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",
+    "safwk:system_ability_fwk",
+    "samgr:samgr_proxy",
   ]
 
   subsystem_name = "ability"
@@ -70,8 +68,6 @@ ohos_source_set("appexecfwk_bundlemgr_mock") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
-    "${distributedschedule_path}/safwk/interfaces/innerkits/safwk:system_ability_fwk",
-    "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
@@ -85,6 +81,8 @@ ohos_source_set("appexecfwk_bundlemgr_mock") {
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "ipc:ipc_core",
+    "safwk:system_ability_fwk",
+    "samgr:samgr_proxy",
   ]
 
   subsystem_name = "ability"

test/mock/services_abilitymgr_test/libs/sa_mgr/BUILD.gn

@@ -15,10 +15,7 @@ import("//build/ohos.gni")
 import("//foundation/ability/ability_runtime/ability_runtime.gni")
 
 config("sa_mgr_mock_config") {
-  include_dirs = [
-    "${ability_runtime_innerkits_path}/deps_wrapper/include",
-    "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
-  ]
+  include_dirs = [ "${ability_runtime_innerkits_path}/deps_wrapper/include" ]
   cflags = []
   if (target_cpu == "arm") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
@@ -32,12 +29,13 @@ ohos_source_set("sa_mgr_mock") {
     "${ability_runtime_services_path}/common:common_config",
   ]
 
-  deps = [ "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy" ]
+  deps = []
 
   external_deps = [
     "c_utils:utils",
     "hilog:libhilog",
     "ipc:ipc_core",
+    "samgr:samgr_proxy",
   ]
 
   subsystem_name = "ability"

test/moduletest/ability_delegator_test/BUILD.gn

@@ -223,6 +223,7 @@ ohos_moduletest("js_test_runner_moduletest") {
 
   external_deps = [
     "ability_base:configuration",
+    "ability_base:extractortool",
     "ability_base:want",
     "ability_runtime:ability_manager",
     "ability_runtime:runtime",

test/unittest/BUILD.gn

@@ -194,10 +194,7 @@ ohos_source_set("abilityms_test_source") {
 
   include_dirs = [
     "${ability_runtime_services_path}/appdfr/include",
-    "${ability_base_kits_path}/extractortool/include",
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core",
-    "${distributedschedule_path}/safwk/interfaces/innerkits/safwk",
-    "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
     "${ability_runtime_path}/interfaces/kits/native/ability/native/distributed_ability_runtime",
@@ -228,6 +225,7 @@ ohos_source_set("abilityms_test_source") {
   external_deps = [
     "ability_base:base",
     "ability_base:configuration",
+    "ability_base:extractortool",
     "ability_base:view_data",
     "ability_base:want",
     "ability_runtime:ability_deps_wrapper",
@@ -255,6 +253,7 @@ ohos_source_set("abilityms_test_source") {
     "relational_store:native_rdb",
     "resource_management:global_resmgr",
     "safwk:system_ability_fwk",
+    "samgr:samgr_proxy",
     "window_manager:libmodal_system_ui_extension_client",
     "window_manager:libwsutils",
     "window_manager:sms",
@@ -293,12 +292,12 @@ ohos_source_set("abilityms_test_source") {
     ]
     deps += [
       "${ace_engine_path}/interfaces/inner_api/ui_service_manager:ui_service_mgr",
-      "${global_path}/i18n/frameworks/intl:intl_util",
-      "${multimedia_path}/interfaces/innerkits:image_native",
-      "//third_party/icu/icu4c:shared_icuuc",
       "//third_party/libjpeg-turbo:turbojpeg_static",
     ]
     external_deps += [
+      "i18n:intl_util",
+      "icu:shared_icuuc",
+      "image_framework:image_native",
       "input:libmmi-client",
       "window_manager:libdm",
       "window_manager:libmodal_system_ui_extension_client",

test/unittest/ability_record_test/BUILD.gn

@@ -64,6 +64,7 @@ ohos_unittest("ability_record_test") {
 
   external_deps = [
     "ability_base:configuration",
+    "ability_base:extractortool",
     "ability_base:session_info",
     "ability_base:want",
     "ability_base:zuri",

test/unittest/ams_app_running_record_test/BUILD.gn

@@ -59,6 +59,7 @@ ohos_unittest("AmsAppRunningRecordTest") {
     "c_utils:utils",
     "ffrt:libffrt",
     "hilog:libhilog",
+    "image_framework:image_native",
     "init:libbegetutil",
     "ipc:ipc_core",
   ]

test/unittest/ams_recent_app_list_test/BUILD.gn

@@ -90,6 +90,7 @@ ohos_unittest("AmsRecentAppListTest") {
     "init:libbegetutil",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "kv_store:distributeddata_mgr",
     "memory_utils:libmeminfo",
     "resource_schedule_service:ressched_client",
   ]

test/unittest/ams_service_load_ability_process_test/BUILD.gn

@@ -92,6 +92,7 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") {
     "init:libbegetutil",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "kv_store:distributeddata_mgr",
     "memory_utils:libmeminfo",
     "resource_schedule_service:ressched_client",
   ]

test/unittest/app_exit_reason_data_manager_test/BUILD.gn

@@ -13,7 +13,6 @@
 
 import("//build/test.gni")
 import("//foundation/ability/ability_runtime/ability_runtime.gni")
-import("//foundation/distributeddatamgr/relational_store/relational_store.gni")
 
 module_output_path = "ability_runtime/abilitymgr"
 

test/unittest/app_mgr_service_event_handler_test/BUILD.gn

@@ -87,6 +87,7 @@ ohos_unittest("AMSEventHandlerTest") {
     "init:libbegetutil",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "kv_store:distributeddata_mgr",
     "memory_utils:libmeminfo",
     "resource_schedule_service:ressched_client",
   ]

test/unittest/app_mgr_service_inner_tdd_test/BUILD.gn

@@ -53,9 +53,11 @@ ohos_unittest("app_mgr_service_inner_tdd_test") {
     "c_utils:utils",
     "ffrt:libffrt",
     "hilog:libhilog",
+    "image_framework:image_native",
     "init:libbeget_proxy",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "kv_store:distributeddata_mgr",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]

test/unittest/app_mgr_service_inner_test/BUILD.gn

@@ -57,9 +57,11 @@ ohos_unittest("AppMgrServiceInnerTest") {
     "c_utils:utils",
     "ffrt:libffrt",
     "hilog:libhilog",
+    "image_framework:image_native",
     "init:libbeget_proxy",
     "init:libbegetutil",
     "ipc:ipc_core",
+    "kv_store:distributeddata_mgr",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]

test/unittest/frameworks_kits_appkit_native_test/BUILD.gn

@@ -129,6 +129,7 @@ ohos_unittest("application_test") {
   external_deps = [
     "ability_base:base",
     "ability_base:configuration",
+    "ability_base:extractortool",
     "ability_base:want",
     "ability_runtime:runtime",
     "bundle_framework:appexecfwk_base",
@@ -383,6 +384,7 @@ ohos_unittest("ability_stage_test") {
   external_deps = [
     "ability_base:base",
     "ability_base:configuration",
+    "ability_base:extractortool",
     "ability_base:want",
     "ability_runtime:runtime",
     "bundle_framework:appexecfwk_base",

test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn

@@ -192,6 +192,7 @@ ohos_unittest("ability_delegator_registry_unittest") {
   ]
 
   external_deps = [
+    "ability_base:extractortool",
     "ability_base:want",
     "ability_runtime:ability_manager",
     "ability_runtime:runtime",
@@ -226,6 +227,7 @@ ohos_unittest("js_test_runner_unittest") {
 
   external_deps = [
     "ability_base:configuration",
+    "ability_base:extractortool",
     "ability_base:want",
     "ability_runtime:ability_manager",
     "ability_runtime:runtime",

test/unittest/ui_ability_lifecycle_manager_test/BUILD.gn

@@ -13,7 +13,6 @@
 
 import("//build/test.gni")
 import("//foundation/ability/ability_runtime/ability_runtime.gni")
-import("//foundation/resourceschedule/background_task_mgr/bgtaskmgr.gni")
 
 module_output_path = "ability_runtime/abilitymgr"
 

tools/aa/BUILD.gn

@@ -19,13 +19,10 @@ config("ability_command_config") {
     "include",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${ability_runtime_services_path}/abilitymgr/include",
-    "${bundlefwk_inner_api_path}/appexecfwk_base/include",
-    "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
-    "//third_party/jsoncpp/include",
   ]
 }
 
-ohos_source_set("tools_aa_source_set") {
+ohos_static_library("tools_aa_source_set") {
   sources = [
     "src/ability_command.cpp",
     "src/ability_tool_command.cpp",
@@ -60,13 +57,16 @@ ohos_source_set("tools_aa_source_set") {
   external_deps = [
     "ability_base:base",
     "ability_base:want",
-    "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "init:libbegetutil",
     "ipc:ipc_core",
+  ]
+  public_external_deps = [
+    "bundle_framework:appexecfwk_base",
+    "jsoncpp:jsoncpp",
     "samgr:samgr_proxy",
   ]
 

tools/test/unittest/ability_delegator/BUILD.gn

@@ -11,7 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//base/security/access_token/access_token.gni")
 import("//build/test.gni")
 import("//foundation/ability/ability_runtime/ability_runtime.gni")