Signed-off-by: chenshixu1 <chenshixu1@huawei.com>
Change-Id: Ib34476e954008886a37d75e3b51753f6b39d1956
This commit is contained in:
chenshixu1 2024-03-20 14:32:06 +08:00
parent 44600b0b13
commit 6c8cb918bc
23 changed files with 120 additions and 103 deletions

View File

@ -52,7 +52,12 @@
"selinux_adapter",
"storage_service",
"mbedtls",
"zlib"
"zlib",
"libuv",
"cJSON",
"mksh",
"libunwind",
"toybox"
],
"third_party": [
"bounds_checking_function",
@ -70,14 +75,6 @@
"storage_service"
]
},
"data_deps" : [
"e2fsprogs:blkid",
"e2fsprogs:e2fsck",
"e2fsprogs:libext2_blkid",
"e2fsprogs:mke2fs",
"e2fsprogs:resize2fs",
"e2fsprogs:e2fsdroid"
],
"build": {
"group_type": {
"base_group": [

View File

@ -43,7 +43,6 @@ if (!defined(ohos_lite)) {
shlib_type = "sa"
include_dirs = [
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include/",
".",
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/interfaces/innerkits/include/param",

View File

@ -32,7 +32,6 @@ config("exported_header_files") {
include_common = [
"./include",
"//base/hiviewdfx/hilog_lite/interfaces/native/kits",
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/interfaces/innerkits/include/param",
"//base/startup/init/interfaces/innerkits/fd_holder",
@ -55,7 +54,10 @@ if (defined(ohos_lite)) {
]
sources = []
include_dirs = include_common
include_dirs += [ "//third_party/bounds_checking_function/include" ]
include_dirs += [
"//third_party/bounds_checking_function/include",
"//base/hiviewdfx/hilog_lite/interfaces/native/kits",
]
public_configs = [ ":exported_header_files" ]
deps = [
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
@ -99,6 +101,7 @@ if (defined(ohos_lite)) {
]
include_dirs = include_common
include_dirs += [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits" ]
deps = [
"//base/startup/init/services/modules/init_hook:inithook",
"//base/startup/init/services/modules/udid:libudidcomm",

View File

@ -25,10 +25,10 @@ ohos_static_library("fdholder") {
sources = [ "fd_holder_internal.c" ]
include_dirs = [
"//base/startup/init/services/loopevent/include",
"//third_party/bounds_checking_function/include",
"//base/startup/init/interfaces/innerkits/include",
]
public_configs = [ ":exported_header_files" ]
external_deps = [ "bounds_checking_function:libsec_static" ]
part_name = "init"
subsystem_name = "startup"
}

View File

@ -28,8 +28,13 @@ if (defined(ohos_lite)) {
"include/",
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/services/log",
"//third_party/cJSON",
]
if (ohos_indep_compiler_enable) {
include_dirs +=
[ "//binarys/third_party/cJSON/innerapis/cjson_static/include" ]
} else {
include_dirs += [ "//third_party/cJSON" ]
}
}
#
@ -74,13 +79,13 @@ if (defined(ohos_lite)) {
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/services/loopevent/include",
"//base/startup/init/services/log",
"//third_party/cJSON",
]
}
ohos_source_set("init_module_engine_sources") {
sources = [ "init_modulemgr.c" ]
public_configs = [ ":init_module_engine_sources_config" ]
external_deps = [ "cJSON:cjson" ]
}
}

View File

@ -37,10 +37,7 @@ ohos_shared_library("deviceinfo") {
}
ohos_shared_library("systemparameter") {
include_dirs = [
"src",
"//third_party/libuv/include",
]
include_dirs = [ "src" ]
sources = [
"src/native_parameters_js.cpp",
@ -54,6 +51,7 @@ ohos_shared_library("systemparameter") {
external_deps = [
"bounds_checking_function:libsec_shared",
"libuv:uv",
"napi:ace_napi",
]
relative_install_dir = "module"
@ -62,10 +60,7 @@ ohos_shared_library("systemparameter") {
}
ohos_shared_library("systemparameterenhance") {
include_dirs = [
"src",
"//third_party/libuv/include",
]
include_dirs = [ "src" ]
sources = [ "src_enhance/native_parameters_js.cpp" ]
@ -77,6 +72,7 @@ ohos_shared_library("systemparameterenhance") {
symlink_target_name = [ "libsystemparameterv9.z.so" ]
external_deps = [
"bounds_checking_function:libsec_shared",
"libuv:uv",
"napi:ace_napi",
]
relative_install_dir = "module"

View File

@ -37,16 +37,26 @@ group("startup_init") {
deps += [ "//base/startup/init/services/etc:watchdog.cfg" ]
deps += [ "//base/startup/init/services/etc:ueventd.cfg" ]
external_deps = [
"e2fsprogs:blkid",
"e2fsprogs:e2fsck",
"e2fsprogs:e2fsdroid",
"e2fsprogs:libext2_blkid",
"e2fsprogs:libext2_com_err",
"e2fsprogs:libext2_e2p",
"e2fsprogs:libext2_misc",
"e2fsprogs:libext2_quota",
"e2fsprogs:libext2_uuid",
"e2fsprogs:libext2fs",
"e2fsprogs:mke2fs",
"e2fsprogs:resize2fs",
]
if (use_musl) {
deps += [ "//third_party/f2fs-tools:f2fs-tools" ]
external_deps += [
"f2fs-tools:fsck.f2fs",
"f2fs-tools:libf2fs",
"f2fs-tools:mkfs.f2fs",
]
}
if (enable_ohos_startup_init_feature_watcher) {

View File

@ -94,15 +94,13 @@ if (defined(ohos_lite)) {
"//base/startup/init/services/param/linux:param_client",
"//base/startup/init/services/sandbox:sandbox",
"//base/startup/init/services/utils:libinit_utils",
"//third_party/cJSON:cjson",
]
deps += [ "//base/startup/init/services/param/base:param_base" ]
external_deps = [
"bounds_checking_function:libsec_shared",
"cJSON:cjson",
"c_utils:utils",
"selinux:libselinux",
"selinux_adapter:libselinux_parameter_static",
]
if (param_test) {
@ -161,12 +159,12 @@ if (defined(ohos_lite)) {
"//base/startup/init/services/log:agent_log",
"//base/startup/init/services/param/linux:param_client",
"//base/startup/init/services/utils:libinit_utils",
"//third_party/cJSON:cjson",
]
deps += [ "//base/startup/init/services/param/base:param_base" ]
external_deps = [
"bounds_checking_function:libsec_shared",
"cJSON:cjson",
"c_utils:utils",
"selinux:libselinux",
"selinux_adapter:libselinux_parameter_static",
@ -197,7 +195,6 @@ if (defined(ohos_lite)) {
if (build_selinux) {
external_deps += [
"bounds_checking_function:libsec_shared",
"selinux:libselinux",
"selinux_adapter:libselinux_parameter_static",
]
@ -247,8 +244,6 @@ if (defined(ohos_lite)) {
"bounds_checking_function:libsec_shared",
"c_utils:utils",
"hilog:libhilog_base",
"selinux:libselinux",
"selinux_adapter:libselinux_parameter_static",
]
if (build_selinux) {
defines += [ "PARAM_SUPPORT_SELINUX" ]

View File

@ -39,12 +39,12 @@ ohos_executable("init_early") {
"switch_root.c",
]
include_dirs = [
"//third_party/cJSON",
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/services/init/include",
"//base/startup/init/interfaces/innerkits/init_module_engine/include",
]
configs = [ "//build/config/gcc:symbol_visibility_hidden" ]
external_deps = [ "cJSON:cjson_static" ]
deps = [
"//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static",
"//base/startup/init/services/log:init_log",
@ -112,12 +112,12 @@ ohos_executable("init") {
"storage_service:libfscryptutils_static",
]
deps += [
"//base/startup/init/ueventd:libueventd_ramdisk_static",
"//third_party/bounds_checking_function:libsec_static",
"//third_party/cJSON:cjson_static",
]
deps += [ "//base/startup/init/ueventd:libueventd_ramdisk_static" ]
external_deps += [ "storage_service:libfscryptutils_static" ]
external_deps += [
"bounds_checking_function:libsec_static",
"cJSON:cjson_static",
]
deps += [ "//base/startup/init/interfaces/innerkits/init_module_engine:libinit_stub_versionscript" ]
deps += [ "//base/startup/init/interfaces/innerkits/init_module_engine:init_module_engine_sources" ]
@ -130,9 +130,9 @@ ohos_executable("init") {
cflags = []
if (use_musl) {
deps += [
"//third_party/mksh:sh",
"//third_party/toybox:toybox",
external_deps += [
"mksh:sh",
"toybox:toybox",
]
}

View File

@ -28,7 +28,6 @@ common_sources = [
common_include = [
"//base/startup/init/services/log",
"//base/startup/init/interfaces/innerkits/include",
"//third_party/bounds_checking_function/include",
"include",
"loop",
"socket",
@ -49,6 +48,7 @@ if (defined(ohos_lite)) {
sources = common_sources
cflags = [ "-fPIC" ]
include_dirs = common_include
include_dirs += [ "//third_party/bounds_checking_function/include" ]
defines = [ "_GNU_SOURCE" ]
public_configs = [ ":exported_header_files" ]
}

View File

@ -22,11 +22,11 @@ ohos_shared_library("bootchart") {
"//base/startup/init/interfaces/innerkits/include/param",
]
deps = [
"//base/startup/init/interfaces/innerkits/init_module_engine:libinit_module_engine",
"//third_party/cJSON:cjson",
deps = [ "//base/startup/init/interfaces/innerkits/init_module_engine:libinit_module_engine" ]
external_deps = [
"bounds_checking_function:libsec_shared",
"cJSON:cjson",
]
external_deps = [ "bounds_checking_function:libsec_shared" ]
part_name = "init"
subsystem_name = "startup"

View File

@ -21,8 +21,6 @@ config("bootevent_static_config") {
"//base/startup/init/services/modules/init_hook",
"//base/startup/init/services/param/include",
"//base/startup/init/interfaces/innerkits/include/param",
"//third_party/bounds_checking_function/include/",
"//base/customization/config_policy/interfaces/inner_api/include",
]
}
@ -34,10 +32,10 @@ ohos_source_set("libbootevent_static") {
public_configs += [ "//base/startup/init/interfaces/innerkits/init_module_engine:init_module_engine_exported_config" ]
public_external_deps += [ "bounds_checking_function:libsec_static" ]
if (build_selinux) {
include_dirs += [
"//third_party/selinux/libselinux/include/",
"//base/security/selinux_adapter/interfaces/policycoreutils/include/",
"//base/startup/init/interfaces/innerkits/include/param",
include_dirs += [ "//base/startup/init/interfaces/innerkits/include/param" ]
external_deps = [
"selinux:libselinux",
"selinux_adapter:librestorecon",
]
defines = [ "WITH_SELINUX" ]
}

View File

@ -26,12 +26,12 @@ ohos_source_set("libcrashhandler") {
"../../init/include",
]
public_configs = [ ":libcrashhandler_config" ]
deps = [
"../../log:init_log",
"//third_party/libunwind:libunwind",
]
deps = [ "../../log:init_log" ]
external_deps = [ "bounds_checking_function:libsec_shared" ]
external_deps = [
"bounds_checking_function:libsec_shared",
"libunwind:libunwind",
]
public_configs += [ "../../../interfaces/innerkits/init_module_engine:init_module_engine_exported_config" ]

View File

@ -25,8 +25,6 @@ comm_include = [
"//base/startup/init/services/loopevent/include",
"//base/startup/init/services/log",
"//base/startup/init/interfaces/innerkits/include",
"//third_party/cJSON",
"//base/hiviewdfx/hilog_lite/interfaces/native/kits",
]
if (defined(ohos_lite)) {
static_library("inithook") {
@ -35,7 +33,11 @@ if (defined(ohos_lite)) {
"OHOS_LITE",
]
include_dirs = comm_include
include_dirs += [ "//third_party/bounds_checking_function/include" ]
include_dirs += [
"//third_party/bounds_checking_function/include",
"//base/hiviewdfx/hilog_lite/interfaces/native/kits",
"//third_party/cJSON",
]
sources = [ "param_hook.c" ]
public_configs = [ ":inithook_config" ]
}
@ -51,6 +53,7 @@ if (defined(ohos_lite)) {
"param_hook.c",
]
public_external_deps = [ "bounds_checking_function:libsec_static" ]
external_deps = [ "cJSON:cjson" ]
if (build_selinux) {
public_external_deps += [
"selinux:libselinux",

View File

@ -23,8 +23,6 @@ ohos_shared_library("selinuxadp") {
"../init_hook",
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/interfaces/innerkits/include/param",
"//third_party/selinux/libselinux/include/",
"//base/security/selinux_adapter/interfaces/policycoreutils/include/",
]
deps = [ "//base/startup/init/interfaces/innerkits/init_module_engine:libinit_module_engine" ]

View File

@ -24,12 +24,10 @@ comm_include = [
ohos_shared_library("inittrace") {
sources = [ "init_trace.c" ]
include_dirs = comm_include
deps = [
"//base/startup/init/interfaces/innerkits/init_module_engine:libinit_module_engine",
"//third_party/cJSON:cjson",
]
deps = [ "//base/startup/init/interfaces/innerkits/init_module_engine:libinit_module_engine" ]
external_deps = [
"bounds_checking_function:libsec_shared",
"cJSON:cjson",
"zlib:libz",
]

View File

@ -22,7 +22,6 @@ comm_include = [
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/interfaces/innerkits/include/syspara",
"//base/startup/init/interfaces/innerkits/syspara",
"//base/hiviewdfx/hilog_lite/interfaces/native/kits",
]
if (defined(ohos_lite)) {
@ -38,6 +37,7 @@ if (defined(ohos_lite)) {
include_dirs += [
"../../../interfaces/innerkits/init_module_engine/include",
"../../../interfaces/hals",
"//base/hiviewdfx/hilog_lite/interfaces/native/kits",
]
sources = [
"udid_adp.c",
@ -78,12 +78,12 @@ if (defined(ohos_lite)) {
]
defines = [ "_GNU_SOURCE" ]
include_dirs = comm_include
deps = [
"//base/startup/init/interfaces/innerkits/init_module_engine:libinit_module_engine",
"//third_party/mbedtls:mbedtls_shared",
]
deps = [ "//base/startup/init/interfaces/innerkits/init_module_engine:libinit_module_engine" ]
external_deps = [ "bounds_checking_function:libsec_shared" ]
external_deps = [
"bounds_checking_function:libsec_shared",
"mbedtls:mbedtls_shared",
]
part_name = "init"
subsystem_name = "startup"

View File

@ -16,7 +16,6 @@ import("//build/ohos.gni")
config("exported_header_files") {
visibility = [ ":*" ]
include_dirs = [
"//base/hiviewdfx/hilog_lite/interfaces/native/kits",
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/interfaces/innerkits/include/param",
"//base/startup/init/services/loopevent/include",
@ -26,6 +25,11 @@ config("exported_header_files") {
]
}
config("exported_header_files_for_lite") {
visibility = [ ":*" ]
include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits" ]
}
comm_sources = [
"//base/startup/init/services/param/base/param_comm.c",
"//base/startup/init/services/param/base/param_trie.c",
@ -39,7 +43,6 @@ base_include_dirs = [
"//base/startup/init/services/param/linux",
"//base/startup/init/services/param/base",
"//base/startup/init/services/loopevent/include",
"//third_party/bounds_checking_function/include",
]
if (defined(ohos_lite)) {
@ -51,8 +54,10 @@ if (defined(ohos_lite)) {
"//base/startup/init/services/param/base/param_base.c",
]
include_dirs = base_include_dirs
include_dirs += [ "//third_party/bounds_checking_function/include" ]
defines = [ "_GNU_SOURCE" ]
public_configs = [ ":exported_header_files" ]
public_configs += [ ":exported_header_files_for_lite" ]
if (ohos_kernel_type == "linux") {
sources += [
@ -111,6 +116,7 @@ if (defined(ohos_lite)) {
public_configs = [ ":exported_header_files" ]
defines = [ "_GNU_SOURCE" ]
deps = []
external_deps = []
if (startup_init_feature_decode_group_file) {
defines += [ "PARAM_DECODE_GROUPID_FROM_FILE" ]
@ -128,21 +134,17 @@ if (defined(ohos_lite)) {
configs += [ "//build/config/compiler:compiler" ]
defines += [ "PARAM_BASE" ]
} else {
include_dirs += [ "//third_party/bounds_checking_function/include" ]
sources += [ "//base/startup/init/services/log/init_commlog.c" ]
external_deps += [ "bounds_checking_function:libsec_shared" ]
}
if (build_selinux) {
include_dirs += [
"//third_party/selinux/libselinux/include/",
"//base/security/selinux_adapter/interfaces/policycoreutils/include/",
]
sources +=
[ "//base/startup/init/services/param/adapter/param_selinux.c" ]
defines += [
"PARAM_SUPPORT_SELINUX",
"PARAMWORKSPACE_NEED_MUTEX",
]
deps += [ "//base/security/selinux_adapter:libselinux_parameter_static" ]
external_deps += [ "selinux_adapter:libselinux_parameter_static" ]
}
if (param_base_log) {
defines += [ "PARAM_BASE_LOG" ]
@ -162,20 +164,17 @@ if (defined(ohos_lite)) {
defines = [ "_GNU_SOURCE" ]
deps = []
include_dirs += [
"//base/startup/init/services/init/include",
"//third_party/bounds_checking_function/include",
]
include_dirs += [ "//base/startup/init/services/init/include" ]
external_deps = [ "bounds_checking_function:libsec_shared" ]
if (build_selinux) {
include_dirs += [
"//third_party/selinux/libselinux/include/",
"//base/security/selinux_adapter/interfaces/policycoreutils/include/",
]
defines += [
"PARAM_SUPPORT_SELINUX",
"PARAMWORKSPACE_NEED_MUTEX",
]
deps += [ "//base/security/selinux_adapter:libselinux_parameter_static" ]
external_deps += [
"selinux:libselinux",
"selinux_adapter:libselinux_parameter_static",
]
}
if (param_base_log) {
defines += [ "PARAM_BASE_LOG" ]

View File

@ -19,8 +19,14 @@ config("exported_header_files") {
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/interfaces/interfaces/innerkits/include/param",
"//base/startup/init/interfaces/service/param/include",
"//third_party/bounds_checking_function/include",
]
}
config("exported_header_files_for_lite") {
visibility = [ ":*" ]
include_dirs = [
"//third_party/selinux/libselinux/include",
"//third_party/bounds_checking_function/include",
]
}
@ -37,9 +43,6 @@ param_include_dirs = [
"//base/startup/init/interfaces/innerkits/include/syspara",
"//base/startup/init/interfaces/innerkits/init_module_engine/include",
"//base/startup/init/services/loopevent/include",
"//third_party/cJSON",
"//commonlibrary/utils_lite/include",
"//base/security/selinux_adapter/interfaces/policycoreutils/include",
]
param_service_sources = [
@ -71,9 +74,13 @@ if (defined(ohos_lite)) {
sources = param_service_sources
sources += param_trigger_sources
include_dirs = param_include_dirs
include_dirs += [ "//third_party/bounds_checking_function/include" ]
include_dirs += [
"//base/security/selinux_adapter/interfaces/policycoreutils/include",
"//commonlibrary/utils_lite/include",
"//third_party/cJSON",
]
public_configs = [ ":exported_header_files" ]
public_configs += [ ":exported_header_files_for_lite" ]
defines += [
"_GNU_SOURCE",
"__LINUX__",
@ -90,8 +97,14 @@ if (defined(ohos_lite)) {
static_library("param_client") {
include_dirs = param_include_dirs
include_dirs += [
"//base/security/selinux_adapter/interfaces/policycoreutils/include",
"//commonlibrary/utils_lite/include",
"//third_party/cJSON",
]
sources = param_client_sources
public_configs = [ ":exported_header_files" ]
public_configs += [ ":exported_header_files_for_lite" ]
cflags = [ "-fPIC" ]
defines = [
"_GNU_SOURCE",
@ -111,8 +124,7 @@ if (defined(ohos_lite)) {
]
external_deps = [
"bounds_checking_function:libsec_static",
"selinux:libselinux",
"selinux_adapter:libselinux_parameter_static",
"cJSON:cjson",
]
public_external_deps = [ "selinux:libselinux" ]
@ -158,10 +170,12 @@ if (defined(ohos_lite)) {
]
external_deps = [
"bounds_checking_function:libsec_static",
"selinux:libselinux",
"cJSON:cjson",
"selinux_adapter:libselinux_parameter_static",
]
public_external_deps = [ "selinux:libselinux" ]
cflags = [ "-Wno-deprecated-pragma" ]
defines = [
"_GNU_SOURCE",

View File

@ -36,7 +36,6 @@ ohos_shared_library("param_watcher") {
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/services/log",
"//base/startup/init/services/loopevent/include",
"//third_party/cJSON",
]
deps = [
@ -52,6 +51,7 @@ ohos_shared_library("param_watcher") {
}
external_deps = [
"cJSON:cjson",
"c_utils:utils",
"ipc:ipc_core",
"safwk:system_ability_fwk",

View File

@ -26,7 +26,6 @@ ohos_static_library("sandbox") {
]
public_configs = [ ":exported_header_files" ]
include_dirs = [
"//third_party/cJSON",
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/interfaces/innerkits/include",
]
@ -41,6 +40,7 @@ ohos_static_library("sandbox") {
]
external_deps = [
"bounds_checking_function:libsec_static",
"cJSON:cjson",
"config_policy:configpolicy_util",
]
part_name = "init"

View File

@ -27,7 +27,6 @@ ohos_shared_library("libparamtestmodule") {
"//base/startup/init/services/param/include",
"//base/startup/init/ueventd/include",
"//base/startup/init/device_info",
"//third_party/cJSON",
]
deps = [
@ -35,7 +34,10 @@ ohos_shared_library("libparamtestmodule") {
"//base/startup/init/interfaces/innerkits/init_module_engine:libinit_module_engine",
"//base/startup/init/services/log:agent_log",
]
external_deps = [ "bounds_checking_function:libsec_shared" ]
external_deps = [
"bounds_checking_function:libsec_shared",
"cJSON:cjson",
]
part_name = "init"
subsystem_name = "startup"

View File

@ -63,7 +63,6 @@ if (defined(ohos_lite)) {
]
service_ueventd_include = [
"//third_party/bounds_checking_function/include",
"//base/startup/init/services/log",
"//base/startup/init/interfaces/innerkits/include",
"//base/startup/init/services/utils",
@ -74,7 +73,6 @@ if (defined(ohos_lite)) {
"//base/startup/init/interfaces/innerkits/socket:libsocket",
"//base/startup/init/services/log:init_log",
"//base/startup/init/services/utils:libinit_utils",
"//third_party/bounds_checking_function:libsec_static",
]
#
@ -96,6 +94,7 @@ if (defined(ohos_lite)) {
cflags += [ "-DWITH_SELINUX" ]
}
external_deps += [ "selinux:libselinux" ]
external_deps += [ "bounds_checking_function:libsec_static" ]
public_configs = [ ":libueventd_exported_config" ]
part_name = "init"
subsystem_name = "startup"
@ -115,6 +114,7 @@ if (defined(ohos_lite)) {
deps = service_ueventd_deps
deps += [ "//base/startup/init/services/param/linux:param_client" ]
external_deps = [ "selinux:libselinux" ]
external_deps += [ "bounds_checking_function:libsec_static" ]
cflags = []
deps += [ "//base/startup/init/services/param/base:param_base" ]
if (build_selinux) {