Fix componentization omissions

Signed-off-by: njupthan <hanhaibin@huawei.com>
2024-11-27 01:10:52 +00:00 · 2022-03-23 10:42:20 +00:00 · 2022-03-23 10:42:20 +00:00 · 02e0f29dc9
commit 02e0f29dc9
parent 1fd5f84f66
44 changed files with 15 additions and 72 deletions
--- a/frameworks/kits/ability/native/BUILD.gn
+++ b/frameworks/kits/ability/native/BUILD.gn
@ -92,11 +92,7 @@ config("ability_public_config") {
 }

 ohos_shared_library("static_subscriber_ipc") {
-  include_dirs = [
-    "include",
-    "//base/notification/ces_standard/interfaces/innerkits/native/include",
-    "${innerkits_path}/want/include/ohos/aafwk/content/",
-  ]
+  include_dirs = [ "include" ]

  sources = [
    "src/static_subscriber_proxy.cpp",
@ -282,7 +278,7 @@ ohos_shared_library("abilitykit_native") {
  ]

  if (ability_runtime_graphics) {
-    include_dirs += [ "//base/global/i18n_standard/frameworks/intl/include" ]
+    include_dirs += []
    sources += [
      "${kits_path}/appkit/native/ability_runtime/form_extension_context.cpp",
      "src/ability_window.cpp",
--- a/frameworks/kits/ability/native/test/BUILD.gn
+++ b/frameworks/kits/ability/native/test/BUILD.gn
@ -31,7 +31,6 @@ config("module_private_config") {
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
    "//foundation/aafwk/standard/services/abilitymgr/include",
-    "//utils/system/safwk/native/include",
    "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
--- a/frameworks/kits/appkit/BUILD.gn
+++ b/frameworks/kits/appkit/BUILD.gn
@ -51,11 +51,7 @@ ohos_executable("appexec") {
    "native/ability_runtime/context",
    "native/app/include",
    "${aafwk_path}/services/common/include",
-    "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr",
    "${aafwk_path}/frameworks/kits/ability/native/include",
-    "${aafwk_path}/interfaces/innerkits/base/include",
-    "${aafwk_path}/interfaces/innerkits/ability_manager/include",
-    "${aafwk_path}/interfaces/innerkits/uri/include",
    "${aafwk_path}/services/abilitymgr/include",
  ]

@ -69,7 +65,10 @@ ohos_executable("appexec") {
  ]

  external_deps = [
+    "ability_base:base",
    "ability_base:want",
+    "ability_base:zuri",
+    "ability_runtime:ability_manager",
    "ability_runtime:app_manager",
    "bundle_framework:appexecfwk_base",
    "bundle_framework:appexecfwk_core",
@ -93,14 +92,8 @@ ohos_shared_library("appkit_native") {
    "native/app/include",
    "native/app/include/task",
    "${aafwk_path}/services/common/include",
-    "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr",
-    "${aafwk_path}/interfaces/innerkits/uri/include",
    "${aafwk_path}/frameworks/kits/ability/native/include",
-    "${aafwk_path}/interfaces/innerkits/ability_manager/include",
    "${aafwk_path}/services/abilitymgr/include",
-    "${aafwk_path}/common/task_dispatcher/include/dispatcher",
-    "${aafwk_path}/common/task_dispatcher/include/task",
-    "${aafwk_path}/common/task_dispatcher/include/threading",
    "${aafwk_path}/interfaces/kits/napi/aafwk/inner/napi_common",
  ]

@ -242,7 +235,6 @@ ohos_shared_library("appkit_delegator") {
    "native/ability_delegator/include",
    "${aafwk_path}/services/common/include",
    "${aafwk_path}/frameworks/kits/ability/native/include",
-    "${aafwk_path}/interfaces/innerkits/ability_manager/include",
  ]

  configs = [ ":appkit_config" ]
--- a/frameworks/kits/fmskit/BUILD.gn
+++ b/frameworks/kits/fmskit/BUILD.gn
@ -27,7 +27,6 @@ config("fmskit_public_config") {
    "${innerkits_path}/form_manager/include",
    "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include",
    "${innerkits_path}/want/include",
-    "//utils/system/safwk/native/include",
  ]
 }

--- a/frameworks/kits/test/BUILD.gn
+++ b/frameworks/kits/test/BUILD.gn
@ -33,7 +33,6 @@ config("module_private_config") {
    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
-    "//utils/system/safwk/native/include",
    "//foundation/aafwk/standard/services/common/include",
    "//foundation/aafwk/standard/frameworks/kits/test/mock/AMS",
    "//foundation/aafwk/standard/services/common/include",
--- a/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn
+++ b/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn
@ -25,7 +25,6 @@ ohos_unittest("pending_want_test") {
    "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime",
    "//foundation/aafwk/standard/services/abilitymgr/include",
    "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/",
-    "//utils/system/safwk/native/include",
    "//utils/native/base/include",
  ]

--- a/interfaces/innerkits/ability_manager/BUILD.gn
+++ b/interfaces/innerkits/ability_manager/BUILD.gn
@ -22,7 +22,6 @@ config("ability_manager_public_config") {
    "//third_party/jsoncpp/include",
    "${innerkits_path}/want/include",
    "//utils/native/base/include",
-    "//utils/system/safwk/native/include",
    "${innerkits_path}/uri/include",
    "${innerkits_path}/want/include/ohos/aafwk/content",
    "${kits_path}/ability/native/include",
--- a/interfaces/innerkits/base/BUILD.gn
+++ b/interfaces/innerkits/base/BUILD.gn
@ -21,7 +21,7 @@ config("base_config") {
 config("base_public_config") {
  visibility = [ ":*" ]
  include_dirs = [
-    "${innerkits_path}/base/include",
+    "include",
    "//utils/native/base/include",
  ]
 }
--- a/interfaces/innerkits/runtime/BUILD.gn
+++ b/interfaces/innerkits/runtime/BUILD.gn
@ -27,12 +27,7 @@ config("runtime_config") {
    defines += [ "_ARM64_" ]
  }

-  include_dirs = [
-    "${innerkits_path}/ability_manager/include",
-    "${innerkits_path}/base/include",
-    "${innerkits_path}/uri/include",
-    "${innerkits_path}/want/include/ohos/aafwk/content",
-  ]
+  include_dirs = []
 }

 config("runtime_public_config") {
@ -62,8 +57,11 @@ ohos_shared_library("runtime") {
  ]

  external_deps = [
+    "ability_base:base",
    "ability_base:configuration",
    "ability_base:want",
+    "ability_base:zuri",
+    "ability_runtime:ability_manager",
    "ability_runtime:app_manager",
    "bundle_framework:appexecfwk_base",
    "eventhandler:libeventhandler",
--- a/interfaces/kits/napi/aafwk/abilityManager/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/abilityManager/BUILD.gn
@ -19,7 +19,6 @@ ohos_shared_library("abilitymanager") {
  include_dirs = [
    "//third_party/node/src",
    "${services_path}/common/include",
-    "//utils/system/safwk/native/include",
    "./",
  ]

@ -51,7 +50,7 @@ ohos_shared_library("abilitymanager") {
  ]

  if (ability_runtime_graphics) {
-    include_dirs += [ "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/" ]
+    include_dirs += []
    deps += []
    external_deps += [
      "multimedia_image_standard:image",
--- a/interfaces/kits/napi/aafwk/ability_constant/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/ability_constant/BUILD.gn
@ -15,13 +15,14 @@ import("//build/ohos.gni")
 import("//foundation/aafwk/standard/aafwk.gni")

 ohos_shared_library("abilityconstant_napi") {
-  include_dirs = [ "${innerkits_path}/ability_manager/include" ]
+  include_dirs = []

  sources = [ "ability_constant_module.cpp" ]

  deps = []

  external_deps = [
+    "ability_runtime:ability_manager",
    "napi:ace_napi",
    "utils_base:utils",
  ]
--- a/interfaces/kits/napi/aafwk/ability_manager/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/ability_manager/BUILD.gn
@ -15,8 +15,6 @@ import("//build/ohos.gni")
 import("//foundation/aafwk/standard/aafwk.gni")

 ohos_shared_library("abilitymanager_napi") {
-  include_dirs = []
-
  sources = [
    "ability_manager_module.cpp",
    "js_ability_manager.cpp",
--- a/interfaces/kits/napi/aafwk/app/appMgr/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/app/appMgr/BUILD.gn
@ -19,7 +19,6 @@ ohos_shared_library("napi_app_mgr") {
  include_dirs = [
    "//third_party/node/src",
    "${services_path}/common/include",
-    "//utils/system/safwk/native/include",
    "./",
  ]

--- a/interfaces/kits/napi/aafwk/app/app_manager/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/app/app_manager/BUILD.gn
@ -16,8 +16,7 @@ import("//foundation/aafwk/standard/aafwk.gni")
 import("//foundation/aafwk/standard/feature.gni")

 ohos_shared_library("appmanager_napi") {
-  include_dirs =
-      [ "//foundation/multimedia/image_standard/interfaces/innerkits/include" ]
+  include_dirs = []

  if (ability_runtime_graphics) {
    include_dirs += [ "./" ]
--- a/interfaces/kits/napi/aafwk/dataShare/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/dataShare/BUILD.gn
@ -18,7 +18,6 @@ ohos_shared_library("datashare") {
  include_dirs = [
    "./",
    "//third_party/node/src",
-    "//third_party/libuv/include",
    "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/napi_rdb/include",
    "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/common/include",
    "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/napi_dataability/include",
--- a/interfaces/kits/napi/aafwk/inner/napi_common/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/inner/napi_common/BUILD.gn
@ -22,7 +22,6 @@ config("napi_common_public_config") {
 ohos_shared_library("napi_common") {
  include_dirs = [
    "//third_party/node/src",
-    "//third_party/libuv/include",
    "//third_party/jsoncpp",
    "//third_party/jsoncpp/include/json",
  ]
--- a/interfaces/kits/napi/aafwk/mission_manager/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/mission_manager/BUILD.gn
@ -16,8 +16,6 @@ import("//foundation/aafwk/standard/aafwk.gni")
 import("//foundation/aafwk/standard/feature.gni")

 ohos_shared_library("missionmanager_napi") {
-  include_dirs = []
-
  sources = [
    "js_mission_info_utils.cpp",
    "js_mission_listener.cpp",
@ -52,10 +50,7 @@ ohos_shared_library("missionmanager_napi") {
  ]

  if (ability_runtime_graphics) {
-    include_dirs += [
-      "//foundation/multimedia/image_standard/interfaces/innerkits/include",
-      "//third_party/icu/icu4c/source/common",
-    ]
+    include_dirs += [ "//third_party/icu/icu4c/source/common" ]
    external_deps += [ "multimedia_image_standard:image" ]
    defines = [ "SUPPORT_GRAPHICS" ]
  }
--- a/interfaces/kits/napi/aafwk/particleAbility/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/particleAbility/BUILD.gn
@ -16,7 +16,6 @@ import("//foundation/aafwk/standard/aafwk.gni")
 ohos_shared_library("particleability") {
  include_dirs = [
    "//third_party/node/src",
-    "//third_party/libuv/include",
    "${aafwk_path}/interfaces/kits/napi/aafwk/featureAbility",
    "${services_path}/common/include",
    "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/napi_rdb/include",
--- a/interfaces/kits/napi/aafwk/wantConstant/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/wantConstant/BUILD.gn
@ -16,7 +16,6 @@ import("//foundation/aafwk/standard/aafwk.gni")
 ohos_shared_library("wantconstant") {
  include_dirs = [
    "//third_party/node/src",
-    "//third_party/libuv/include",
    "./",
  ]

--- a/services/abilitymgr/BUILD.gn
+++ b/services/abilitymgr/BUILD.gn
@ -45,7 +45,6 @@ config("abilityms_config") {
    "${innerkits_path}/want/include/ohos/aafwk/content",
    "${services_path}/common/include",
    "//utils/native/base/include",
-    "//utils/system/safwk/native/include",
    "//prebuilts/jdk/jdk8/linux-x86/include",
    "//prebuilts/jdk/jdk8/linux-x86/include/linux",
    "//third_party/json/include",
--- a/services/formmgr/test/BUILD.gn
+++ b/services/formmgr/test/BUILD.gn
@ -16,7 +16,6 @@ import("//foundation/aafwk/standard/aafwk.gni")
 config("formmgr_test_config") {
  include_dirs = [
    "//utils/native/base/include",
-    "//utils/system/safwk/native/include",
    "mock/include",
  ]

--- a/services/test/moduletest/common/ams/BUILD.gn
+++ b/services/test/moduletest/common/ams/BUILD.gn
@ -16,7 +16,6 @@ import("//foundation/aafwk/standard/aafwk.gni")

 config("appmgr_test_config") {
  include_dirs = [
-    "//utils/system/safwk/native/include",
    "//base/account/os_account/interfaces/innerkits/osaccount/native/include",
    "//base/notification/ces_standard/frameworks/core/include",
    "//base/notification/ces_standard/interfaces/innerkits/native/include",
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/BUILD.gn
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/BUILD.gn
@ -25,7 +25,6 @@ config("amsKitSTAbilityManagerConfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/BUILD.gn
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/BUILD.gn
@ -25,7 +25,6 @@ config("amsKitSTAbilityManagerConfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/BUILD.gn
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/BUILD.gn
@ -25,7 +25,6 @@ config("amsKitSystemTestconfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn
@ -27,7 +27,6 @@ config("amsKitSystemTestServiceconfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "//third_party/jsoncpp/include",
  ]
  defines = [
--- a/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn
+++ b/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn
@ -28,7 +28,6 @@ config("fmsSystemPerformanceConfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
    "//third_party/jsoncpp/include",
  ]
--- a/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn
+++ b/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn
@ -28,7 +28,6 @@ config("fmsSystemStressConfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
    "//third_party/jsoncpp/include",
  ]
--- a/test/resource/formsystemtestability/fmsSystemTestHostCommonA/BUILD.gn
+++ b/test/resource/formsystemtestability/fmsSystemTestHostCommonA/BUILD.gn
@ -28,7 +28,6 @@ config("fmsSystemTestHostCommonAConfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
    "//third_party/jsoncpp/include",
    "//foundation/distributedschedule/safwk/services/safwk/include",
--- a/test/resource/formsystemtestability/fmsSystemTestHostCommonB/BUILD.gn
+++ b/test/resource/formsystemtestability/fmsSystemTestHostCommonB/BUILD.gn
@ -28,7 +28,6 @@ config("fmsSystemTestHostCommonBConfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
    "//third_party/jsoncpp/include",
    "//foundation/distributedschedule/safwk/services/safwk/include",
--- a/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn
+++ b/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn
@ -28,7 +28,6 @@ config("fmsSystemTestHostNoPermConfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
    "//third_party/jsoncpp/include",
  ]
--- a/test/resource/formsystemtestability/fmsSystemTestHostNormal/BUILD.gn
+++ b/test/resource/formsystemtestability/fmsSystemTestHostNormal/BUILD.gn
@ -28,7 +28,6 @@ config("fmsSystemTestHostNormalConfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
    "//third_party/jsoncpp/include",
    "//foundation/distributedschedule/safwk/services/safwk/include",
--- a/test/resource/formsystemtestability/fmsSystemTestHostNormalB/BUILD.gn
+++ b/test/resource/formsystemtestability/fmsSystemTestHostNormalB/BUILD.gn
@ -28,7 +28,6 @@ config("fmsSystemTestHostNormalBConfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
    "//third_party/jsoncpp/include",
    "//foundation/distributedschedule/safwk/services/safwk/include",
--- a/test/resource/formsystemtestability/fmsSystemTestHostNormalC/BUILD.gn
+++ b/test/resource/formsystemtestability/fmsSystemTestHostNormalC/BUILD.gn
@ -28,7 +28,6 @@ config("fmsSystemTestHostNormalCConfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
    "//third_party/jsoncpp/include",
    "//foundation/distributedschedule/safwk/services/safwk/include",
--- a/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn
+++ b/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn
@ -28,7 +28,6 @@ config("fmsSystemTestHostNotSysConfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
    "//third_party/jsoncpp/include",
  ]
--- a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn
+++ b/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn
@ -28,7 +28,6 @@ config("selfStartingTestHostAConfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
    "//third_party/jsoncpp/include",
  ]
--- a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn
+++ b/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn
@ -28,7 +28,6 @@ config("selfStartingTestHostBConfig") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app",
    "${appexecfwk_path}/services/bundlemgr/include",
-    "//utils/system/safwk/native/include",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
    "//third_party/jsoncpp/include",
  ]
--- a/test/systemtest/common/ams/ams_ability_state_age_manual_test/BUILD.gn
+++ b/test/systemtest/common/ams/ams_ability_state_age_manual_test/BUILD.gn
@ -22,7 +22,6 @@ config("system_test_ams_ability_state_age_manual_test_config") {
    "${aafwk_path}/interfaces/innerkits/intent/include",
    "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
    "${aafwk_path}/interfaces/innerkits/want/include",
-    "//utils/system/safwk/native/include",
    "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr",
    "${aafwk_path}/frameworks/kits/ability/native/include",
    "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content",
--- a/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn
+++ b/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn
@ -22,7 +22,6 @@ config("system_test_ams_ability_state_test_config") {
    "${aafwk_path}/interfaces/innerkits/intent/include",
    "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
    "${aafwk_path}/interfaces/innerkits/want/include",
-    "//utils/system/safwk/native/include",
    "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr",
    "${aafwk_path}/frameworks/kits/ability/native/include",
    "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content",
--- a/test/systemtest/common/ams/ams_check_service/BUILD.gn
+++ b/test/systemtest/common/ams/ams_check_service/BUILD.gn
@ -22,7 +22,6 @@ config("ams_check_service_config") {
    "${aafwk_path}/interfaces/innerkits/intent/include",
    "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
    "${aafwk_path}/interfaces/innerkits/want/include",
-    "//utils/system/safwk/native/include",
    "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr",
    "${aafwk_path}/frameworks/kits/ability/native/include",
    "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content",
--- a/test/systemtest/common/task_dispatcher/BUILD.gn
+++ b/test/systemtest/common/task_dispatcher/BUILD.gn
@ -24,7 +24,6 @@ config("system_test_task_dispatcher_config") {
    "${aafwk_path}/interfaces/innerkits/intent/include",
    "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
    "${aafwk_path}/interfaces/innerkits/want/include",
-    "//utils/system/safwk/native/include",
    "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr",
    "${aafwk_path}/frameworks/kits/ability/native/include",
    "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content",
--- a/tools/fm/BUILD.gn
+++ b/tools/fm/BUILD.gn
@ -24,7 +24,6 @@ config("tools_fm_config") {
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
    "//utils/native/base/include",
-    "//utils/system/safwk/native/include",
    "include",
  ]
 }
--- a/tools/test/systemtest/aa/BUILD.gn
+++ b/tools/test/systemtest/aa/BUILD.gn
@ -21,7 +21,6 @@ config("tools_aa_test_config") {
    "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include",
    "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
    "${appexecfwk_path}/tools/bm/include",
-    "//utils/system/safwk/native/include",
    "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk/main/cpp/include",
    "//base/security/appverify/interfaces/innerkits/appverify/include",
  ]
--- a/zidl/test/native/BUILD.gn
+++ b/zidl/test/native/BUILD.gn
@ -22,7 +22,6 @@ config("ipc_test_config") {
    "$ZIDL_TEST_DIR/include",
    "$IPC_SUBSYSTEM_DIR/utils/include",
    "$IPC_SUBSYSTEM_DIR/ipc/native/src/mock/include",
-    "//utils/system/safwk/native/include",
  ]
 }