From 6eaa2376212cbabef96e7d623e0fd03c6f023e52 Mon Sep 17 00:00:00 2001 From: taiyipei Date: Tue, 26 Apr 2022 01:22:51 -0700 Subject: [PATCH] remove useless include dirs Signed-off-by: taiyipei --- device_info/BUILD.gn | 4 +--- interfaces/innerkits/BUILD.gn | 9 +++++---- services/begetctl/BUILD.gn | 13 ++++--------- services/param/BUILD.gn | 1 - services/param/watcher/BUILD.gn | 12 ++---------- 5 files changed, 12 insertions(+), 27 deletions(-) diff --git a/device_info/BUILD.gn b/device_info/BUILD.gn index a67c602c..3d71e9b9 100644 --- a/device_info/BUILD.gn +++ b/device_info/BUILD.gn @@ -32,15 +32,12 @@ ohos_shared_library("deviceinfoservice") { ".", "//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/syspara_lite/hals/parameter/include", - "//utils/native/base/include", - "//utils/system/safwk/native/include", ] deps = [ "//base/startup/init_lite/services/log:agent_log", "//base/startup/syspara_lite/hals/parameter:sysparam_hal", "//third_party/bounds_checking_function:libsec_shared", - "//utils/native/base:utils", ] external_deps = [ @@ -49,6 +46,7 @@ ohos_shared_library("deviceinfoservice") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "utils_base:utils", ] install_images = [ "system" ] part_name = "init" diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index 100a48f7..4c415e21 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -74,9 +74,11 @@ if (defined(ohos_lite)) { "//base/startup/init_lite/services/utils:libinit_tools", "//base/startup/init_lite/services/utils:libinit_utils", "//third_party/bounds_checking_function:libsec_shared", - "//utils/native/base:utils", ] - external_deps = [ "hilog_native:libhilog_base" ] + external_deps = [ + "hilog_native:libhilog_base", + "utils_base:utils", + ] public_configs = [ ":exported_header_files" ] part_name = "init" install_images = [ @@ -97,7 +99,6 @@ if (defined(ohos_lite)) { include_dirs = [ "./include", "//base/startup/init_lite/device_info", - "//utils/native/base/include", "//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init_lite/services/include", "//base/startup/init_lite/services/include/param", @@ -109,7 +110,6 @@ if (defined(ohos_lite)) { "//base/startup/init_lite/services/param/watcher:param_watcheragent", "//base/startup/init_lite/services/utils:libinit_utils", "//third_party/bounds_checking_function:libsec_shared", - "//utils/native/base:utils", ] external_deps = [ @@ -117,6 +117,7 @@ if (defined(ohos_lite)) { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "utils_base:utils", ] part_name = "init" install_images = [ "system" ] diff --git a/services/begetctl/BUILD.gn b/services/begetctl/BUILD.gn index efa3a94c..7998f3f8 100644 --- a/services/begetctl/BUILD.gn +++ b/services/begetctl/BUILD.gn @@ -37,13 +37,11 @@ ohos_executable("begetctl") { "//base/startup/init_lite/services/include", "//base/startup/init_lite/services/log", "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", "//base/startup/init_lite/services/include/param/", "//base/startup/init_lite/services/param/include", "//base/startup/init_lite/services/loopevent/include", "//third_party/bounds_checking_function/include", "//base/startup/init_lite/interfaces/innerkits/sandbox/include", - "//utils/native/base/include", ] deps = [ "//base/startup/init_lite/interfaces/innerkits:libbegetutil", @@ -51,9 +49,9 @@ ohos_executable("begetctl") { "//base/startup/init_lite/services/log:agent_log", "//base/startup/init_lite/services/param:param_client", "//third_party/bounds_checking_function:libsec_static", - "//utils/native/base:utils", ] + external_deps = [ "utils_base:utils" ] if (param_test) { sources += [ "//base/startup/init_lite/test/plugintest/plugin_param_cmd.c" ] deps += [ @@ -62,21 +60,18 @@ ohos_executable("begetctl") { "//base/startup/init_lite/services/param/watcher:param_watcheragent", "//base/startup/init_lite/services/utils:libinit_tools", "//base/startup/init_lite/services/utils:libinit_utils", - "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara", ] defines += [ "OHOS_SERVICE_DUMP", "INIT_TEST", ] + external_deps += [ "startup_l2:syspara" ] } if (build_selinux) { - include_dirs += [ - "//third_party/selinux/libselinux/include/", - "//base/security/selinux/interfaces/policycoreutils/include/", - ] + include_dirs += [ "//third_party/selinux/libselinux/include/" ] deps += [ "//third_party/selinux:libselinux" ] - external_deps = [ "selinux:libparaperm_checker" ] + external_deps += [ "selinux:libparaperm_checker" ] defines += [ "WITH_SELINUX" ] } diff --git a/services/param/BUILD.gn b/services/param/BUILD.gn index d35275b2..15b2c173 100755 --- a/services/param/BUILD.gn +++ b/services/param/BUILD.gn @@ -42,7 +42,6 @@ ohos_static_library("param_service") { "//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init_lite/services/loopevent/include", "//base/security/selinux/interfaces/policycoreutils/include", - "//third_party/libuv/include", "//third_party/cJSON", ] diff --git a/services/param/watcher/BUILD.gn b/services/param/watcher/BUILD.gn index 720f6374..251a7c0f 100644 --- a/services/param/watcher/BUILD.gn +++ b/services/param/watcher/BUILD.gn @@ -41,13 +41,13 @@ ohos_shared_library("param_watcheragent") { "//base/startup/init_lite/services/log:agent_log", "//base/startup/init_lite/services/param:param_client", "//third_party/bounds_checking_function:libsec_static", - "//utils/native/base:utils", ] external_deps = [ "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "utils_base:utils", ] part_name = "init" @@ -70,28 +70,20 @@ ohos_shared_library("param_watcher") { "//base/startup/init_lite/services/log", "//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init_lite/services/loopevent/include", - "//third_party/libuv/include", "//third_party/cJSON", - "//utils/native/base/include", - "//utils/system/safwk/native/include", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", - "//foundation/distributedschedule/safwk/services/safwk/include", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", - "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", ] deps = [ "//base/startup/init_lite/services/log:agent_log", "//base/startup/init_lite/services/param:param_client", "//third_party/bounds_checking_function:libsec_static", - "//utils/native/base:utils", ] external_deps = [ "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "utils_base:utils", ] install_images = [ "system" ] part_name = "init" -- GitLab