diff --git a/README.md b/README.md index aefa8107229112376537a3c974ae3bd8e398c086..4ab9187dca06b5d5521718445bd4716abd19f08e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# init\_lite +# init - [Introduction](#section469617221261) - [Directory Structure](#section15884114210197) @@ -8,27 +8,27 @@ ## Introduction -The init\_lite module starts system service processes from the time the kernel loads the first user-space process to the time the first application is started. In addition to loading key system processes, the module needs to configure their permissions during the startup and keep the specified process alive after sub-processes are started. If a process exits abnormally, the module needs to restart it, and to perform system reset for a special process. +The init module starts system service processes from the time the kernel loads the first user-space process to the time the first application is started. In addition to loading key system processes, the module needs to configure their permissions during the startup and keep the specified process alive after sub-processes are started. If a process exits abnormally, the module needs to restart it, and to perform system reset for a special process. ## Directory Structure ``` -base/startup/init_lite/ # init_lite module +base/startup/init/ # init module ├── LICENSE └── services - ├── include # Header files for the init_lite module - ├── src # Source files for the init_lite module - └── test # Source files of the test cases for the init_lite module + ├── include # Header files for the init module + ├── src # Source files for the init module + └── test # Source files of the test cases for the init module └── unittest vendor └──huawei └──camera - └──init_configs # init_lite configuration files (in JSON format, and deployed in /etc/init.cfg after image burning) + └──init_configs # init configuration files (in JSON format, and deployed in /etc/init.cfg after image burning) ``` ## Constraints -Currently, the init\_lite module applies only to small-system devices \(reference memory ≥ 1 MB\), for example, Hi3516D V300 and Hi3518E V300. +Currently, the init module applies only to small-system devices \(reference memory ≥ 1 MB\), for example, Hi3516D V300 and Hi3518E V300. ## Usage diff --git a/README_zh.md b/README_zh.md index 57643232b50fcb25f81c4087edfc48c94f5fd4f9..ae08aca61a201156328499e8a7e5f1f5898d4cb5 100644 --- a/README_zh.md +++ b/README_zh.md @@ -14,7 +14,7 @@ init组件负责处理从内核加载第一个用户态进程开始,到第一 ## 目录 ``` -base/startup/init_lite/ # init组件 +base/startup/init/ # init组件 ├── device_info ├── initsync ├── interfaces # init提供的对外接口 @@ -84,7 +84,7 @@ init将系统启动分为三个阶段: 每个沙盒环境的分为只读资源和可写资源,只读资源由init在初始化时创建好,通过mount bind把只读文件指向全局FS中对应的目录,然后启动相应沙盒进程时通过SetNamespace跳入到沙盒环境运行。对于可写目录,通过对全局/data目录进行划分,由存储服务进行统一管理分配,通过mnt namespace完成可写目录的沙盒化。 -init的关键配置文件init.cfg位于代码仓库base/startup/init_lite/service/etc目录,部署在/etc/下,采用json格式,文件大小目前限制在100KB以内。 +init的关键配置文件init.cfg位于代码仓库base/startup/init/service/etc目录,部署在/etc/下,采用json格式,文件大小目前限制在100KB以内。 配置文件格式和内容说明如下所示: diff --git a/bundle.json b/bundle.json index 8ba9de9655d7fef333e539419e713e3813a0e6db..1c2571b683e16043686caa5e40b463bb6f91eccb 100755 --- a/bundle.json +++ b/bundle.json @@ -7,7 +7,7 @@ "repository": "https://gitee.com/openharmony/startup_init_lite", "publishAs": "code-segment", "segment": { - "destPath": "base/startup/init_lite" + "destPath": "base/startup/init" }, "dirs": {}, "scripts": {}, @@ -45,21 +45,21 @@ }, "build": { "sub_component": [ - "//base/startup/init_lite/services:startup_init", - "//base/startup/init_lite/ueventd:startup_ueventd", - "//base/startup/init_lite/watchdog:watchdog", - "//base/startup/init_lite/services/begetctl:begetctl_cmd", - "//base/startup/init_lite/services/loopevent:loopeventgroup", - "//base/startup/init_lite/services/modules:modulesgroup", - "//base/startup/init_lite/services/param:parameter", - "//base/startup/init_lite/interfaces/innerkits:innergroup", - "//base/startup/init_lite/device_info:device_info_group", - "//base/startup/init_lite/interfaces/kits:kitsgroup" + "//base/startup/init/services:startup_init", + "//base/startup/init/ueventd:startup_ueventd", + "//base/startup/init/watchdog:watchdog", + "//base/startup/init/services/begetctl:begetctl_cmd", + "//base/startup/init/services/loopevent:loopeventgroup", + "//base/startup/init/services/modules:modulesgroup", + "//base/startup/init/services/param:parameter", + "//base/startup/init/interfaces/innerkits:innergroup", + "//base/startup/init/device_info:device_info_group", + "//base/startup/init/interfaces/kits:kitsgroup" ], "inner_kits": [ { "header": { - "header_base": "//base/startup/init_lite/interfaces/innerkits/include/", + "header_base": "//base/startup/init/interfaces/innerkits/include/", "header_files": [ "init_socket.h", "init_file.h", @@ -75,31 +75,31 @@ "syspara/sysversion.h" ] }, - "name": "//base/startup/init_lite/interfaces/innerkits:libbegetutil" + "name": "//base/startup/init/interfaces/innerkits:libbegetutil" }, { "header": { - "header_base": "//base/startup/init_lite/interfaces/innerkits/include/", + "header_base": "//base/startup/init/interfaces/innerkits/include/", "header_files": [ "service_watcher.h", "syspara/parameter.h", "syspara/sysparam_errno.h" ] }, - "name": "//base/startup/init_lite/interfaces/innerkits:libbeget_proxy" + "name": "//base/startup/init/interfaces/innerkits:libbeget_proxy" }, { "header": { - "header_base": "//base/startup/init_lite/interfaces/innerkits", + "header_base": "//base/startup/init/interfaces/innerkits", "header_files": [ "init_module_engine/include/init_module_engine.h" ] }, - "name": "//base/startup/init_lite/interfaces/innerkits/init_module_engine:libinit_module_engine" + "name": "//base/startup/init/interfaces/innerkits/init_module_engine:libinit_module_engine" } ], "test": [ - "//base/startup/init_lite/test:testgroup" + "//base/startup/init/test:testgroup" ] } } diff --git a/device_info/BUILD.gn b/device_info/BUILD.gn index b9a32135a49e567c2222727a119e4f07da8a5778..c6e87652ca44ae0e2b9ef5e2daad6f0930c396d7 100644 --- a/device_info/BUILD.gn +++ b/device_info/BUILD.gn @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") if (!defined(ohos_lite)) { import("//build/ohos.gni") import("//build/ohos/sa_profile/sa_profile.gni") @@ -28,17 +28,17 @@ if (!defined(ohos_lite)) { ohos_shared_library("deviceinfoservice") { sources = [ - "//base/startup/init_lite/interfaces/innerkits/syspara/param_comm.c", + "//base/startup/init/interfaces/innerkits/syspara/param_comm.c", "device_info_stub.cpp", ] include_dirs = [ ".", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/innerkits/include/syspara", - "//base/startup/init_lite/interfaces/innerkits/syspara", - "//base/startup/init_lite/interfaces/hals", + "//base/startup/init/services/include/param", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/include/syspara", + "//base/startup/init/interfaces/innerkits/syspara", + "//base/startup/init/interfaces/hals", ] defines = [ "INIT_AGENT", @@ -46,7 +46,7 @@ if (!defined(ohos_lite)) { "USE_MBEDTLS", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_shared", "//third_party/mbedtls:mbedtls_shared", ] diff --git a/initsync/BUILD.gn b/initsync/BUILD.gn index 7c57f697e50016087424eef57faeb91595038a4b..a2906bd47140d4866af7807b48ce560994f1b235 100644 --- a/initsync/BUILD.gn +++ b/initsync/BUILD.gn @@ -14,19 +14,19 @@ import("//build/lite/config/component/lite_component.gni") lite_component("initsync") { - features = [ "//base/startup/init_lite/initsync:libinitsync_shared" ] + features = [ "//base/startup/init/initsync:libinitsync_shared" ] } shared_library("libinitsync_shared") { sources = [ "src/init_sync.c" ] include_dirs = [ - "//base/startup/init_lite/initsync/include", - "//base/startup/init_lite/interfaces/kits/syscap", - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/interfaces/innerkits/include", + "//base/startup/init/initsync/include", + "//base/startup/init/interfaces/kits/syscap", + "//base/startup/init/services/log", + "//base/startup/init/interfaces/innerkits/include", ] public_deps = [ - "//base/startup/init_lite/services/log:init_log", + "//base/startup/init/services/log:init_log", "//third_party/bounds_checking_function:libsec_shared", ] } @@ -34,10 +34,10 @@ shared_library("libinitsync_shared") { static_library("libinitsync_static") { sources = [ "src/init_sync.c" ] include_dirs = [ - "//base/startup/init_lite/initsync/include", - "//base/startup/init_lite/interfaces/kits/syscap", - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/interfaces/innerkits/include", + "//base/startup/init/initsync/include", + "//base/startup/init/interfaces/kits/syscap", + "//base/startup/init/services/log", + "//base/startup/init/interfaces/innerkits/include", ] public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] } diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index d9b20443cbf15d01a86a382f7b259b78e7908c21..e731145bd2b7cfac1604e8e6b1926e418f455932 100755 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") if (!defined(ohos_lite) || enable_ohos_startup_init_feature_begetctl_liteos) { syspara_sources = [ "syscap/init_syscap.c", @@ -23,12 +23,12 @@ if (!defined(ohos_lite) || enable_ohos_startup_init_feature_begetctl_liteos) { config("exported_header_files") { visibility = [ ":*" ] include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/innerkits/include/syspara", - "//base/startup/init_lite/interfaces/innerkits/include/fs_manager", - "//base/startup/init_lite/interfaces/innerkits/include/token", - "//base/startup/init_lite/interfaces/innerkits/include/sandbox/include", - "//base/startup/init_lite/services/include", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/include/syspara", + "//base/startup/init/interfaces/innerkits/include/fs_manager", + "//base/startup/init/interfaces/innerkits/include/token", + "//base/startup/init/interfaces/innerkits/include/sandbox/include", + "//base/startup/init/services/include", ] } @@ -36,14 +36,14 @@ include_common = [ "./include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits", "//third_party/bounds_checking_function/include", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/interfaces/innerkits/fd_holder", - "//base/startup/init_lite/services/param/include", - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/innerkits/include/syspara", - "//base/startup/init_lite/interfaces/hals", - "//base/startup/init_lite/interfaces/innerkits/syspara", + "//base/startup/init/services/include", + "//base/startup/init/services/include/param", + "//base/startup/init/interfaces/innerkits/fd_holder", + "//base/startup/init/services/param/include", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/include/syspara", + "//base/startup/init/interfaces/hals", + "//base/startup/init/interfaces/innerkits/syspara", ] if (defined(ohos_lite)) { @@ -67,8 +67,8 @@ if (defined(ohos_lite)) { "//third_party/mbedtls:mbedtls_shared", ] deps += [ - "//base/startup/init_lite/services/log:init_log", - "//base/startup/init_lite/services/utils:libinit_utils", + "//base/startup/init/services/log:init_log", + "//base/startup/init/services/utils:libinit_utils", ] if (enable_ohos_startup_init_feature_begetctl_liteos) { sources += syspara_sources @@ -79,16 +79,15 @@ if (defined(ohos_lite)) { } if (ohos_kernel_type == "liteos_a") { defines += [ "__LITEOS_A__" ] - deps += [ - "//base/startup/init_lite/services/param/liteos:param_client_lite", - ] + deps += + [ "//base/startup/init/services/param/liteos:param_client_lite" ] } else if (ohos_kernel_type == "linux") { sources += [ "socket/init_socket.c" ] defines += [ "__LINUX__" ] deps += [ - "//base/startup/init_lite/services/loopevent:loopevent", - "//base/startup/init_lite/services/param/base:parameterbase", - "//base/startup/init_lite/services/param/linux:param_client", + "//base/startup/init/services/loopevent:loopevent", + "//base/startup/init/services/param/base:parameterbase", + "//base/startup/init/services/param/linux:param_client", ] } } @@ -123,9 +122,9 @@ if (defined(ohos_lite)) { } if (enable_ohos_startup_init_feature_begetctl_liteos) { deps += [ - "//base/startup/init_lite/services/log:init_log", - "//base/startup/init_lite/services/param/liteos:param_client_lite", - "//base/startup/init_lite/services/utils:libinit_utils", + "//base/startup/init/services/log:init_log", + "//base/startup/init/services/param/liteos:param_client_lite", + "//base/startup/init/services/utils:libinit_utils", ] } } @@ -140,8 +139,7 @@ if (defined(ohos_lite)) { lib_extension = ".so" } deps = [ ":libbegetutil" ] - head_files = - [ "//base/startup/init_lite/interfaces/innerkits/include/syspara" ] + head_files = [ "//base/startup/init/interfaces/innerkits/include/syspara" ] } group("libbeget_proxy") { @@ -174,17 +172,17 @@ if (defined(ohos_lite)) { include_dirs = include_common deps = [ - "//base/startup/init_lite/interfaces/innerkits/control_fd:libcontrolfd", - "//base/startup/init_lite/interfaces/innerkits/fd_holder:fdholder", - "//base/startup/init_lite/interfaces/innerkits/file:libfile", - "//base/startup/init_lite/interfaces/innerkits/fs_manager:libfsmanager_static", - "//base/startup/init_lite/interfaces/innerkits/sandbox:sandbox", - "//base/startup/init_lite/interfaces/innerkits/socket:libsocket", - "//base/startup/init_lite/services/log:agent_log", - "//base/startup/init_lite/services/loopevent:loopevent", - "//base/startup/init_lite/services/param/base:parameterbase", - "//base/startup/init_lite/services/param/linux:param_client", - "//base/startup/init_lite/services/utils:libinit_utils", + "//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd", + "//base/startup/init/interfaces/innerkits/fd_holder:fdholder", + "//base/startup/init/interfaces/innerkits/file:libfile", + "//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static", + "//base/startup/init/interfaces/innerkits/sandbox:sandbox", + "//base/startup/init/interfaces/innerkits/socket:libsocket", + "//base/startup/init/services/log:agent_log", + "//base/startup/init/services/loopevent:loopevent", + "//base/startup/init/services/param/base:parameterbase", + "//base/startup/init/services/param/linux:param_client", + "//base/startup/init/services/utils:libinit_utils", "//third_party/bounds_checking_function:libsec_shared", "//third_party/cJSON:cjson", "//third_party/mbedtls:mbedtls_shared", @@ -209,7 +207,7 @@ if (defined(ohos_lite)) { "USE_MBEDTLS", ] sources = [ - "//base/startup/init_lite/device_info/device_info.cpp", + "//base/startup/init/device_info/device_info.cpp", "service_watcher/service_watcher.c", ] @@ -221,14 +219,14 @@ if (defined(ohos_lite)) { if (enable_ohos_startup_init_feature_watcher) { sources += [ - "//base/startup/init_lite/services/param/watcher/agent/watcher.cpp", - "//base/startup/init_lite/services/param/watcher/agent/watcher_manager_kits.cpp", - "//base/startup/init_lite/services/param/watcher/agent/watcher_manager_proxy.cpp", - "//base/startup/init_lite/services/param/watcher/agent/watcher_stub.cpp", + "//base/startup/init/services/param/watcher/agent/watcher.cpp", + "//base/startup/init/services/param/watcher/agent/watcher_manager_kits.cpp", + "//base/startup/init/services/param/watcher/agent/watcher_manager_proxy.cpp", + "//base/startup/init/services/param/watcher/agent/watcher_stub.cpp", ] include_dirs += [ - "//base/startup/init_lite/services/param/watcher/include", - "//base/startup/init_lite/services/log", + "//base/startup/init/services/param/watcher/include", + "//base/startup/init/services/log", ] } else { defines += [ "NO_PARAM_WATCHER" ] @@ -236,15 +234,14 @@ if (defined(ohos_lite)) { if (enable_ohos_startup_init_feature_deviceinfo) { sources += [ - "//base/startup/init_lite/device_info/device_info_kits.cpp", - "//base/startup/init_lite/device_info/device_info_load.cpp", - "//base/startup/init_lite/device_info/device_info_proxy.cpp", + "//base/startup/init/device_info/device_info_kits.cpp", + "//base/startup/init/device_info/device_info_load.cpp", + "//base/startup/init/device_info/device_info_proxy.cpp", ] defines += [ "PARAM_FEATURE_DEVICEINFO" ] } else { - sources += [ - "//base/startup/init_lite/interfaces/innerkits/syspara/param_comm.c", - ] + sources += + [ "//base/startup/init/interfaces/innerkits/syspara/param_comm.c" ] } external_deps = [ @@ -273,11 +270,11 @@ if (defined(ohos_lite)) { include_dirs = include_common deps = [ - "//base/startup/init_lite/services/log:agent_log", - "//base/startup/init_lite/services/loopevent:loopevent", - "//base/startup/init_lite/services/param/base:parameterbase", - "//base/startup/init_lite/services/param/linux:param_client", - "//base/startup/init_lite/services/utils:libinit_utils", + "//base/startup/init/services/log:agent_log", + "//base/startup/init/services/loopevent:loopevent", + "//base/startup/init/services/param/base:parameterbase", + "//base/startup/init/services/param/linux:param_client", + "//base/startup/init/services/utils:libinit_utils", "//third_party/bounds_checking_function:libsec_shared", "//third_party/mbedtls:mbedtls_shared", ] diff --git a/interfaces/innerkits/control_fd/BUILD.gn b/interfaces/innerkits/control_fd/BUILD.gn index 42103a77858b8ef2c0bcaf9a0e15047463782600..8c934844fcf40a4de1f4c64a488b6a5fc298fd65 100644 --- a/interfaces/innerkits/control_fd/BUILD.gn +++ b/interfaces/innerkits/control_fd/BUILD.gn @@ -11,14 +11,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") import("//build/ohos.gni") config("exported_header_files") { visibility = [ ":*" ] include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/innerkits/control_fd", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/control_fd", ] } @@ -31,8 +31,8 @@ ohos_static_library("libcontrolfd") { include_dirs = [ ".", "//third_party/bounds_checking_function/include", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/loopevent/include", + "//base/startup/init/services/include", + "//base/startup/init/services/loopevent/include", ] part_name = "init" } diff --git a/interfaces/innerkits/fd_holder/BUILD.gn b/interfaces/innerkits/fd_holder/BUILD.gn index 44a27b743915e318b2f92b03094b0f9abccfc544..b2327fc6916e1b2f70f63c930f262bf6fabf4efc 100644 --- a/interfaces/innerkits/fd_holder/BUILD.gn +++ b/interfaces/innerkits/fd_holder/BUILD.gn @@ -16,17 +16,17 @@ import("//build/ohos.gni") config("exported_header_files") { visibility = [ ":*" ] include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/innerkits/fd_holder", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/fd_holder", ] } ohos_static_library("fdholder") { sources = [ "fd_holder_internal.c" ] include_dirs = [ - "//base/startup/init_lite/services/loopevent/include", + "//base/startup/init/services/loopevent/include", "//third_party/bounds_checking_function/include", - "//base/startup/init_lite/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/include", ] public_configs = [ ":exported_header_files" ] part_name = "init" diff --git a/interfaces/innerkits/file/BUILD.gn b/interfaces/innerkits/file/BUILD.gn index c5f8832931c5eb893143da26c026e4d1d4218a06..25517b57587021876ab173dbe669ba8bfc98cf62 100644 --- a/interfaces/innerkits/file/BUILD.gn +++ b/interfaces/innerkits/file/BUILD.gn @@ -13,14 +13,14 @@ import("//build/ohos.gni") config("exported_header_files") { visibility = [ ":*" ] - include_dirs = [ "//base/startup/init_lite/interfaces/innerkits/include" ] + include_dirs = [ "//base/startup/init/interfaces/innerkits/include" ] } ohos_static_library("libfile") { sources = [ "init_file.c" ] include_dirs = [ - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/services/include", + "//base/startup/init/services/log", + "//base/startup/init/services/include", "//third_party/bounds_checking_function/include", ] public_configs = [ ":exported_header_files" ] diff --git a/interfaces/innerkits/fs_manager/BUILD.gn b/interfaces/innerkits/fs_manager/BUILD.gn index 396f2bd35332432910451539e6413fdb64fb514a..f46dc36ac8457ed9748f2bb809df4a4be514b392 100644 --- a/interfaces/innerkits/fs_manager/BUILD.gn +++ b/interfaces/innerkits/fs_manager/BUILD.gn @@ -16,7 +16,7 @@ import("//build/ohos.gni") config("libfsmanager_exported_configs") { visibility = [ ":*" ] include_dirs = - [ "//base/startup/init_lite/interfaces/innerkits/include/fs_manager" ] + [ "//base/startup/init/interfaces/innerkits/include/fs_manager" ] } ohos_static_library("libfsmanager_static") { @@ -25,11 +25,11 @@ ohos_static_library("libfsmanager_static") { "fstab_mount.c", ] include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/include", "//third_party/bounds_checking_function/include", - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/param/include", + "//base/startup/init/services/log", + "//base/startup/init/services/include", + "//base/startup/init/services/param/include", ] public_configs = [ ":libfsmanager_exported_configs" ] part_name = "init" diff --git a/interfaces/innerkits/init_module_engine/BUILD.gn b/interfaces/innerkits/init_module_engine/BUILD.gn index 6c91e673e656efcee4f12249a24ad0c61b79d44a..320d0d6fba88fafae0094d1d48eced99597bc31b 100755 --- a/interfaces/innerkits/init_module_engine/BUILD.gn +++ b/interfaces/innerkits/init_module_engine/BUILD.gn @@ -25,9 +25,9 @@ if (defined(ohos_lite)) { visibility = [ ":*" ] include_dirs = [ "include/", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/services/log", + "//base/startup/init/services/include", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/services/log", "//third_party/cJSON", ] } @@ -62,10 +62,10 @@ if (defined(ohos_lite)) { config("init_module_engine_sources_config") { include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/init_module_engine/include", - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/log", + "//base/startup/init/interfaces/innerkits/init_module_engine/include", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/services/include", + "//base/startup/init/services/log", "//third_party/cJSON", ] } diff --git a/interfaces/innerkits/sandbox/BUILD.gn b/interfaces/innerkits/sandbox/BUILD.gn index a125a21d4f53c957ae45bbbb97094f0e714c4b9f..1032602a666cf0da93323e63098766e17f41f9de 100644 --- a/interfaces/innerkits/sandbox/BUILD.gn +++ b/interfaces/innerkits/sandbox/BUILD.gn @@ -11,13 +11,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") import("//build/ohos.gni") config("exported_header_files") { visibility = [ ":*" ] - include_dirs = - [ "//base/startup/init_lite/interfaces/innerkits/sandbox/include" ] + include_dirs = [ "//base/startup/init/interfaces/innerkits/sandbox/include" ] } ohos_static_library("sandbox") { @@ -28,8 +27,8 @@ ohos_static_library("sandbox") { public_configs = [ ":exported_header_files" ] include_dirs = [ "//third_party/bounds_checking_function/include", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/interfaces/innerkits/include", + "//base/startup/init/services/include", + "//base/startup/init/interfaces/innerkits/include", "//third_party/cJSON", ] if (target_cpu == "arm64") { diff --git a/interfaces/innerkits/socket/BUILD.gn b/interfaces/innerkits/socket/BUILD.gn index 06fff8070020c0cc2603743d31a25cb8c6710e76..b989622cef39033eac41e2cf8bfc79f4c21afa08 100644 --- a/interfaces/innerkits/socket/BUILD.gn +++ b/interfaces/innerkits/socket/BUILD.gn @@ -12,10 +12,10 @@ # limitations under the License. service_socket_sources = - [ "//base/startup/init_lite/interfaces/innerkits/socket/init_socket.c" ] + [ "//base/startup/init/interfaces/innerkits/socket/init_socket.c" ] service_socket_include = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/services/log", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/services/log", "//third_party/bounds_checking_function/include", ] diff --git a/interfaces/innerkits/syscap/BUILD.gn b/interfaces/innerkits/syscap/BUILD.gn index bec0497a39ef0fec2c4d8b8092ed4e5a93cbbe30..95952dccdfab16ae2469288fec032b84507ca362 100755 --- a/interfaces/innerkits/syscap/BUILD.gn +++ b/interfaces/innerkits/syscap/BUILD.gn @@ -22,10 +22,10 @@ ohos_shared_library("syscap") { include_dirs = [ "../include", - "//base/startup/init_lite/services/include/param", + "//base/startup/init/services/include/param", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_shared", ] diff --git a/interfaces/innerkits/token/BUILD.gn b/interfaces/innerkits/token/BUILD.gn index d0d8f99cedd0db103518d1c22ce0634737c34bdb..d0aaff46c296c5f8e8e2b8e1de6c2ef010de8cc5 100755 --- a/interfaces/innerkits/token/BUILD.gn +++ b/interfaces/innerkits/token/BUILD.gn @@ -12,17 +12,17 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") import("//build/lite/config/component/lite_component.gni") import("//build/lite/ndk/ndk.gni") if (ohos_kernel_type == "liteos_a" || ohos_kernel_type == "linux") { shared_library("token_shared") { include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/innerkits/include/token", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/include/token", "//utils/native/lite/include", - "//base/startup/init_lite/interfaces/innerkits/token", + "//base/startup/init/interfaces/innerkits/token", ] sources = [ "src/token_impl_posix/token.c" ] @@ -38,10 +38,10 @@ if (ohos_kernel_type == "liteos_m") { sources = [ "src/token_impl_hal/token.c" ] include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/innerkits/include/token", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/include/token", "//utils/native/lite/include", - "//base/startup/init_lite/interfaces/innerkits/token", + "//base/startup/init/interfaces/innerkits/token", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite", ] @@ -67,8 +67,7 @@ ndk_lib("token_notes") { lib_extension = ".so" } if (ohos_kernel_type != "liteos_m") { - deps += - [ "//base/startup/init_lite/interfaces/innerkits/token:token_shared" ] + deps += [ "//base/startup/init/interfaces/innerkits/token:token_shared" ] } - head_files += [ "//base/startup/init_lite/interfaces/include/token" ] + head_files += [ "//base/startup/init/interfaces/include/token" ] } diff --git a/interfaces/kits/BUILD.gn b/interfaces/kits/BUILD.gn index 3d4e7753ad07ba9b083bc694f2bf0d4bc6aa2420..ea0ac6f9ac619d8849048b65e817e7c8e1053e45 100755 --- a/interfaces/kits/BUILD.gn +++ b/interfaces/kits/BUILD.gn @@ -16,8 +16,8 @@ import("//build/ohos.gni") group("kitsgroup") { if (!defined(ohos_lite)) { deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbeget_proxy", - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbeget_proxy", + "//base/startup/init/interfaces/innerkits:libbegetutil", ] deps += [ "syscap:deviceinfo_ndk" ] if (support_jsapi) { diff --git a/interfaces/kits/jskits/BUILD.gn b/interfaces/kits/jskits/BUILD.gn index 7c28fc5085a0354c385b429bdda0b3ab7033a2f4..588afc772d70f6cdee4dcbe92f4a29250efd9acc 100755 --- a/interfaces/kits/jskits/BUILD.gn +++ b/interfaces/kits/jskits/BUILD.gn @@ -14,13 +14,13 @@ import("//build/ohos.gni") ohos_shared_library("deviceinfo") { - include_dirs = [ "//base/startup/init_lite/interfaces/innerkits/include" ] + include_dirs = [ "//base/startup/init/interfaces/innerkits/include" ] sources = [ "src/native_deviceinfo_js.cpp" ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbeget_proxy", - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbeget_proxy", + "//base/startup/init/interfaces/innerkits:libbegetutil", ] external_deps = [ "hiviewdfx_hilog_native:libhilog", @@ -43,8 +43,8 @@ ohos_shared_library("systemparameter") { ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbeget_proxy", - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbeget_proxy", + "//base/startup/init/interfaces/innerkits:libbegetutil", ] external_deps = [ diff --git a/interfaces/kits/syscap/BUILD.gn b/interfaces/kits/syscap/BUILD.gn index 7ab2b22ca27c1a962b53503988538fdb82e6c8b9..76b75bdd45c0f57bfd5194b6ed3a4f3f891ae52f 100755 --- a/interfaces/kits/syscap/BUILD.gn +++ b/interfaces/kits/syscap/BUILD.gn @@ -16,7 +16,7 @@ import("//build/ohos.gni") ohos_shared_library("deviceinfo_ndk") { sources = [ "src/syscap_ndk.c" ] include_dirs = [ "./include" ] - deps = [ "//base/startup/init_lite/interfaces/innerkits:libbegetutil" ] + deps = [ "//base/startup/init/interfaces/innerkits:libbegetutil" ] part_name = "init" } diff --git a/services/BUILD.gn b/services/BUILD.gn index e48002ee1431ebc5da6a755871bd417089a3f4f1..87e82bbedeb20e53eb361feb306a971b180d2326 100755 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") group("startup_init") { deps = [] @@ -23,7 +23,7 @@ group("startup_init") { # for unittest if (ohos_build_type == "debug") { - deps += [ "//base/startup/init_lite/test/unittest/lite:init_test" ] + deps += [ "//base/startup/init/test/unittest/lite:init_test" ] } } @@ -35,9 +35,9 @@ group("startup_init") { ] if (enable_ohos_startup_init_feature_watcher) { deps += [ - "//base/startup/init_lite/services/param/watcher:param_watcher", - "//base/startup/init_lite/services/param/watcher:param_watcher.rc", - "//base/startup/init_lite/services/param/watcher/sa_profile:param_watcher_profile", + "//base/startup/init/services/param/watcher:param_watcher", + "//base/startup/init/services/param/watcher:param_watcher.rc", + "//base/startup/init/services/param/watcher/sa_profile:param_watcher_profile", ] } } diff --git a/services/begetctl/BUILD.gn b/services/begetctl/BUILD.gn index 6b3d876f708da7f4e157df00c34ae4c4ba6cd4aa..a4c7971ccc3dca27732152a9e3f304749c416078 100755 --- a/services/begetctl/BUILD.gn +++ b/services/begetctl/BUILD.gn @@ -10,21 +10,21 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") common_include_dirs = [ - "//base/startup/init_lite/services/begetctl", - "//base/startup/init_lite/services/begetctl/shell", - "//base/startup/init_lite/services/param/include", - "//base/startup/init_lite/services/param/adapter", - "//base/startup/init_lite/services/param/linux", - "//base/startup/init_lite/services/param/base", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/loopevent/include", - "//base/startup/init_lite/services/init/include", - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/interfaces/innerkits/include", + "//base/startup/init/services/begetctl", + "//base/startup/init/services/begetctl/shell", + "//base/startup/init/services/param/include", + "//base/startup/init/services/param/adapter", + "//base/startup/init/services/param/linux", + "//base/startup/init/services/param/base", + "//base/startup/init/services/include/param", + "//base/startup/init/services/include", + "//base/startup/init/services/loopevent/include", + "//base/startup/init/services/init/include", + "//base/startup/init/services/log", + "//base/startup/init/interfaces/innerkits/include", "//third_party/bounds_checking_function/include", ] @@ -42,14 +42,14 @@ if (defined(ohos_lite)) { "OHOS_LITE", ] if (param_test) { - sources += [ "//base/startup/init_lite/test/moduletest/syspara.cpp" ] + sources += [ "//base/startup/init/test/moduletest/syspara.cpp" ] } include_dirs = common_include_dirs deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", - "//base/startup/init_lite/services/utils:libinit_utils", + "//base/startup/init/interfaces/innerkits:libbegetutil", + "//base/startup/init/services/utils:libinit_utils", "//build/lite/config/component/cJSON:cjson_static", "//third_party/bounds_checking_function:libsec_static", ] @@ -79,23 +79,23 @@ if (defined(ohos_lite)) { include_dirs = [ "//third_party/bounds_checking_function/include", - "//base/startup/init_lite/interfaces/innerkits/sandbox/include", - "//base/startup/init_lite/interfaces/innerkits/control_fd", + "//base/startup/init/interfaces/innerkits/sandbox/include", + "//base/startup/init/interfaces/innerkits/control_fd", ] include_dirs += common_include_dirs deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", - "//base/startup/init_lite/interfaces/innerkits/control_fd:libcontrolfd", + "//base/startup/init/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd", "//third_party/bounds_checking_function:libsec_shared", ] external_deps = [ "utils_base:utils" ] if (param_test) { sources += [ - "//base/startup/init_lite/test/moduletest/param_test_cmds.c", - "//base/startup/init_lite/test/moduletest/syspara.cpp", + "//base/startup/init/test/moduletest/param_test_cmds.c", + "//base/startup/init/test/moduletest/syspara.cpp", ] - deps += [ "//base/startup/init_lite/interfaces/innerkits:libbeget_proxy" ] + deps += [ "//base/startup/init/interfaces/innerkits:libbeget_proxy" ] defines += [ "OHOS_SERVICE_DUMP", "INIT_TEST", @@ -139,7 +139,7 @@ if (defined(ohos_lite)) { defines = [ "_GNU_SOURCE" ] include_dirs = common_include_dirs deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_static", ] @@ -151,10 +151,10 @@ if (defined(ohos_lite)) { if (param_test) { sources += [ - "//base/startup/init_lite/test/moduletest/param_test_cmds.c", - "//base/startup/init_lite/test/moduletest/syspara.cpp", + "//base/startup/init/test/moduletest/param_test_cmds.c", + "//base/startup/init/test/moduletest/syspara.cpp", ] - deps += [ "//base/startup/init_lite/interfaces/innerkits:libbeget_proxy" ] + deps += [ "//base/startup/init/interfaces/innerkits:libbeget_proxy" ] defines += [ "OHOS_SERVICE_DUMP", "INIT_TEST", @@ -181,11 +181,11 @@ if (defined(ohos_lite)) { include_dirs = common_include_dirs deps = [ - "//base/startup/init_lite/services/log:agent_log", - "//base/startup/init_lite/services/loopevent:loopevent", - "//base/startup/init_lite/services/param/base:parameterbase", - "//base/startup/init_lite/services/param/linux:param_client", - "//base/startup/init_lite/services/utils:libinit_utils", + "//base/startup/init/services/log:agent_log", + "//base/startup/init/services/loopevent:loopevent", + "//base/startup/init/services/param/base:parameterbase", + "//base/startup/init/services/param/linux:param_client", + "//base/startup/init/services/utils:libinit_utils", "//third_party/bounds_checking_function:libsec_static", ] diff --git a/services/etc/BUILD.gn b/services/etc/BUILD.gn index 9f3405bacd986b9673dedb9451e3bef0db0f855b..1d46aa4c66ca69b39c509c07f0a89c35374eae47 100755 --- a/services/etc/BUILD.gn +++ b/services/etc/BUILD.gn @@ -13,27 +13,26 @@ if (defined(ohos_lite)) { copy("ohos.para") { - sources = [ "//base/startup/init_lite/services/etc/param/ohos.para" ] + sources = [ "//base/startup/init/services/etc/param/ohos.para" ] outputs = [ "$root_out_dir/system/etc/param/ohos.para" ] } copy("ohos.para.dac") { - sources = [ "//base/startup/init_lite/services/etc/param/ohos.para.dac" ] + sources = [ "//base/startup/init/services/etc/param/ohos.para.dac" ] outputs = [ "$root_out_dir/system/etc/param/ohos.para.dac" ] } copy("ohos.const") { - sources = [ - "//base/startup/init_lite/services/etc_lite/param/ohos_const/ohos.para", - ] + sources = + [ "//base/startup/init/services/etc_lite/param/ohos_const/ohos.para" ] outputs = [ "$root_out_dir/system/etc/param/ohos_const/ohos.para" ] } copy("ohos.passwd") { - sources = [ "//base/startup/init_lite/services/etc_lite/passwd" ] + sources = [ "//base/startup/init/services/etc_lite/passwd" ] outputs = [ "$root_out_dir/etc/passwd" ] } copy("ohos.group") { - sources = [ "//base/startup/init_lite/services/etc_lite/group" ] + sources = [ "//base/startup/init/services/etc_lite/group" ] outputs = [ "$root_out_dir/etc/group" ] } @@ -51,46 +50,45 @@ if (defined(ohos_lite)) { } } } else { - import("//base/startup/init_lite/services/etc/param/param_fixer.gni") + import("//base/startup/init/services/etc/param/param_fixer.gni") import("//build/ohos.gni") # init etc files group ohos_prebuilt_etc("init.cfg") { if (!enable_ramdisk) { - source = - "//base/startup/init_lite/services/etc/init.without_two_stages.cfg" + source = "//base/startup/init/services/etc/init.without_two_stages.cfg" } else { - source = "//base/startup/init_lite/services/etc/init.cfg" + source = "//base/startup/init/services/etc/init.cfg" } part_name = "init" } ohos_prebuilt_etc("misc.cfg") { - source = "//base/startup/init_lite/services/etc/misc.cfg" + source = "//base/startup/init/services/etc/misc.cfg" relative_install_dir = "init" part_name = "init" } ohos_prebuilt_etc("watchdog.cfg") { - source = "//base/startup/init_lite/services/etc/watchdog.cfg" + source = "//base/startup/init/services/etc/watchdog.cfg" relative_install_dir = "init" part_name = "init" } ohos_prebuilt_etc("console.cfg") { - source = "//base/startup/init_lite/services/etc/console.cfg" + source = "//base/startup/init/services/etc/console.cfg" relative_install_dir = "init" part_name = "init" } ohos_prebuilt_etc("ueventd.cfg") { - source = "//base/startup/init_lite/services/etc/ueventd.cfg" + source = "//base/startup/init/services/etc/ueventd.cfg" relative_install_dir = "init" part_name = "init" } ohos_prebuilt_etc("passwd") { - source = "//base/startup/init_lite/services/etc/passwd" + source = "//base/startup/init/services/etc/passwd" install_images = [ "system", "updater", @@ -99,7 +97,7 @@ if (defined(ohos_lite)) { } ohos_prebuilt_etc("group") { - source = "//base/startup/init_lite/services/etc/group" + source = "//base/startup/init/services/etc/group" install_images = [ "system", "updater", @@ -108,17 +106,17 @@ if (defined(ohos_lite)) { } ohos_prebuilt_etc("init.usb.cfg") { - source = "//base/startup/init_lite/services/etc/init.usb.cfg" + source = "//base/startup/init/services/etc/init.usb.cfg" part_name = "init" } ohos_prebuilt_etc("init.usb.configfs.cfg") { - source = "//base/startup/init_lite/services/etc/init.usb.configfs.cfg" + source = "//base/startup/init/services/etc/init.usb.configfs.cfg" part_name = "init" } ohos_prebuilt_para("ohos.para") { - source = "//base/startup/init_lite/services/etc/param/ohos.para" + source = "//base/startup/init/services/etc/param/ohos.para" install_images = [ "system", "updater", @@ -131,7 +129,7 @@ if (defined(ohos_lite)) { } ohos_prebuilt_para("ohos.para.dac") { - source = "//base/startup/init_lite/services/etc/param/ohos.para.dac" + source = "//base/startup/init/services/etc/param/ohos.para.dac" install_images = [ "system", "updater", @@ -141,18 +139,18 @@ if (defined(ohos_lite)) { } ohos_prebuilt_para("ohos_const.para") { - source = "//base/startup/init_lite/services/etc/param/ohos_const/ohos.para" + source = "//base/startup/init/services/etc/param/ohos_const/ohos.para" part_name = "init" module_install_dir = "etc/param/ohos_const" } ohos_prebuilt_etc("boot.group") { - source = "//base/startup/init_lite/services/etc/device.boot.group.cfg" + source = "//base/startup/init/services/etc/device.boot.group.cfg" part_name = "init" } ohos_prebuilt_etc("charge.group") { - source = "//base/startup/init_lite/services/etc/device.charge.group.cfg" + source = "//base/startup/init/services/etc/device.charge.group.cfg" part_name = "init" } @@ -174,9 +172,10 @@ if (defined(ohos_lite)) { ohos_prebuilt_etc("system-sandbox.json") { if (target_cpu == "arm64") { - source = "//base/startup/init_lite/interfaces/innerkits/sandbox/system-sandbox64.json" + source = "//base/startup/init/interfaces/innerkits/sandbox/system-sandbox64.json" } else { - source = "//base/startup/init_lite/interfaces/innerkits/sandbox/system-sandbox.json" + source = + "//base/startup/init/interfaces/innerkits/sandbox/system-sandbox.json" } part_name = "init" module_install_dir = "etc/sandbox" @@ -184,16 +183,16 @@ if (defined(ohos_lite)) { ohos_prebuilt_etc("chipset-sandbox.json") { if (target_cpu == "arm64") { - source = "//base/startup/init_lite/interfaces/innerkits/sandbox/chipset-sandbox64.json" + source = "//base/startup/init/interfaces/innerkits/sandbox/chipset-sandbox64.json" } else { - source = "//base/startup/init_lite/interfaces/innerkits/sandbox/chipset-sandbox.json" + source = "//base/startup/init/interfaces/innerkits/sandbox/chipset-sandbox.json" } part_name = "init" module_install_dir = "etc/sandbox" } ohos_prebuilt_etc("init.reboot") { - source = "//base/startup/init_lite/services/etc/init.reboot.cfg" + source = "//base/startup/init/services/etc/init.reboot.cfg" part_name = "init" module_install_dir = "etc/init" } diff --git a/services/etc/param/param_fixer.gni b/services/etc/param/param_fixer.gni index fa7e29ddf0934cf7b84b21735432abaef69198f7..1f253aac59ef96705373e18c9b81d938beb54298 100755 --- a/services/etc/param/param_fixer.gni +++ b/services/etc/param/param_fixer.gni @@ -24,7 +24,7 @@ template("ohos_prebuilt_para") { _output_para_file = get_path_info(invoker.source, "file") action_with_pydeps(_fixed_param_target) { deps = [] - script = "//base/startup/init_lite/services/etc/param/param_fixer.py" + script = "//base/startup/init/services/etc/param/param_fixer.py" depfile = "${target_gen_dir}/${target_name}.d" args = [ "--output", diff --git a/services/init/lite/BUILD.gn b/services/init/lite/BUILD.gn index 46e12a67c519c9fbbb0f4c7a4aa898d36252bca4..7b5a71595ab6e7848f76630091e2f65aa2b5820a 100644 --- a/services/init/lite/BUILD.gn +++ b/services/init/lite/BUILD.gn @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") init_common_sources = [ "../init_capability.c", @@ -47,9 +47,9 @@ executable("init") { sources += init_common_sources include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/innerkits/fd_holder", - "//base/startup/init_lite/services/init/include", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/fd_holder", + "//base/startup/init/services/init/include", "//third_party/cJSON", "//third_party/bounds_checking_function/include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits", @@ -58,10 +58,10 @@ executable("init") { ldflags = [] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//base/startup/init_lite/services/log:init_log", - "//base/startup/init_lite/services/loopevent:loopevent", - "//base/startup/init_lite/services/param/base:parameterbase", - "//base/startup/init_lite/services/utils:libinit_utils", + "//base/startup/init/services/log:init_log", + "//base/startup/init/services/loopevent:loopevent", + "//base/startup/init/services/param/base:parameterbase", + "//base/startup/init/services/utils:libinit_utils", "//build/lite/config/component/cJSON:cjson_static", "//third_party/bounds_checking_function:libsec_static", ] @@ -71,12 +71,12 @@ executable("init") { include_dirs += [ "//kernel/liteos_a/syscall", "//kernel/liteos_a/kernel/include", - "//base/startup/init_lite/interfaces/kits/syscap", - "//base/startup/init_lite/initsync/include", + "//base/startup/init/interfaces/kits/syscap", + "//base/startup/init/initsync/include", ] deps += [ - "//base/startup/init_lite/initsync:initsync", - "//base/startup/init_lite/services/param/liteos:param_init_lite", + "//base/startup/init/initsync:initsync", + "//base/startup/init/services/param/liteos:param_init_lite", ] } if (ohos_kernel_type == "linux") { @@ -89,7 +89,7 @@ executable("init") { "-lpthread", ] deps += [ - "//base/startup/init_lite/services/param/linux:param_init", + "//base/startup/init/services/param/linux:param_init", "//third_party/mksh", "//third_party/toybox", ] diff --git a/services/init/lite/bundle.json b/services/init/lite/bundle.json index b3c37cfddaa4b45fdbca2c8ef8f51382e7ae26e9..54e3696f3c844d5ef8fade228b64ad0c846dd7b0 100644 --- a/services/init/lite/bundle.json +++ b/services/init/lite/bundle.json @@ -7,7 +7,7 @@ "repository": "https://gitee.com/openharmony/startup_init_lite", "publishAs": "code-segment", "segment": { - "destPath": "base/startup/init_lite" + "destPath": "base/startup/init" }, "dirs": {}, "scripts": {}, @@ -29,18 +29,18 @@ }, "build": { "sub_component": [ - "//base/startup/init_lite/services:startup_init", - "//base/startup/init_lite/ueventd:startup_ueventd", - "//base/startup/init_lite/watchdog:watchdog", - "//base/startup/init_lite/services/begetctl:begetctl_cmd", - "//base/startup/init_lite/services/loopevent:loopeventgroup", - "//base/startup/init_lite/services/modules:modulesgroup", - "//base/startup/init_lite/services/param:parameter" + "//base/startup/init/services:startup_init", + "//base/startup/init/ueventd:startup_ueventd", + "//base/startup/init/watchdog:watchdog", + "//base/startup/init/services/begetctl:begetctl_cmd", + "//base/startup/init/services/loopevent:loopeventgroup", + "//base/startup/init/services/modules:modulesgroup", + "//base/startup/init/services/param:parameter" ], "inner_kits": [ { "header": { - "header_base": "//base/startup/init_lite/interfaces/innerkits/include/", + "header_base": "//base/startup/init/interfaces/innerkits/include/", "header_files": [ "beget_ext.h", "syspara/parameter.h", @@ -50,11 +50,11 @@ "syspara/sysversion.h" ] }, - "name": "//base/startup/init_lite/interfaces/innerkits:libbegetutil" + "name": "//base/startup/init/interfaces/innerkits:libbegetutil" } ], "test": [ - "//base/startup/init_lite/test:testgroup" + "//base/startup/init/test:testgroup" ] } } diff --git a/services/init/standard/BUILD.gn b/services/init/standard/BUILD.gn index 66bdfee60ca93cb9fc8151132ff5e2a8bcf361ec..725f2ec8c398dd85630f36dc85088975bfb795d5 100644 --- a/services/init/standard/BUILD.gn +++ b/services/init/standard/BUILD.gn @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") init_common_sources = [ "../init_capability.c", @@ -45,37 +45,37 @@ ohos_executable("init") { ] modulemgr_sources = [ - "//base/startup/init_lite/interfaces/innerkits/hookmgr/hookmgr.c", - "//base/startup/init_lite/interfaces/innerkits/modulemgr/modulemgr.c", + "//base/startup/init/interfaces/innerkits/hookmgr/hookmgr.c", + "//base/startup/init/interfaces/innerkits/modulemgr/modulemgr.c", ] sources += modulemgr_sources sources += init_common_sources - include_dirs = [ "//base/startup/init_lite/services/init/include" ] + include_dirs = [ "//base/startup/init/services/init/include" ] deps = [ - "//base/startup/init_lite/interfaces/innerkits/control_fd:libcontrolfd", - "//base/startup/init_lite/interfaces/innerkits/fd_holder:fdholder", - "//base/startup/init_lite/interfaces/innerkits/fs_manager:libfsmanager_static", - "//base/startup/init_lite/interfaces/innerkits/sandbox:sandbox", - "//base/startup/init_lite/services/loopevent:loopevent", - "//base/startup/init_lite/services/param/base:parameterbase", - "//base/startup/init_lite/services/param/linux:param_init", - "//base/startup/init_lite/services/utils:libinit_utils", + "//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd", + "//base/startup/init/interfaces/innerkits/fd_holder:fdholder", + "//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static", + "//base/startup/init/interfaces/innerkits/sandbox:sandbox", + "//base/startup/init/services/loopevent:loopevent", + "//base/startup/init/services/param/base:parameterbase", + "//base/startup/init/services/param/linux:param_init", + "//base/startup/init/services/utils:libinit_utils", ] deps += [ "//base/customization/config_policy/frameworks/config_policy:configpolicy_util_for_init_static", "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", - "//base/startup/init_lite/ueventd:libueventd_ramdisk_static", + "//base/startup/init/ueventd:libueventd_ramdisk_static", "//third_party/bounds_checking_function:libsec_static", "//third_party/cJSON:cjson_static", ] - deps += [ "//base/startup/init_lite/interfaces/innerkits/init_module_engine:libinit_stub_versionscript" ] - deps += [ "//base/startup/init_lite/interfaces/innerkits/init_module_engine:init_module_engine_sources" ] - deps += [ "//base/startup/init_lite/services/modules:static_modules" ] + 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" ] + deps += [ "//base/startup/init/services/modules:static_modules" ] cflags = [] @@ -125,9 +125,9 @@ ohos_executable("init") { defines += [ "PRODUCT_RK" ] } version_script = get_label_info( - "//base/startup/init_lite/interfaces/innerkits/init_module_engine:libinit_stub_versionscript", + "//base/startup/init/interfaces/innerkits/init_module_engine:libinit_stub_versionscript", "target_gen_dir") + "/" + get_label_info( - "//base/startup/init_lite/interfaces/innerkits/init_module_engine:libinit_stub_versionscript", + "//base/startup/init/interfaces/innerkits/init_module_engine:libinit_stub_versionscript", "name") + stub_version_script_suffix defines += [ "_GNU_SOURCE" ] install_images = [ diff --git a/services/log/BUILD.gn b/services/log/BUILD.gn index 678118203e6aa21210dfc3f4e1e5142c6b47acae..d523813b11782bb3b46c2d13e3d9b5e28775ee96 100755 --- a/services/log/BUILD.gn +++ b/services/log/BUILD.gn @@ -15,8 +15,8 @@ base_sources = [ "init_log.c" ] config("exported_header_files") { visibility = [ ":*" ] include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/services/log", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/services/log", ] } diff --git a/services/loopevent/BUILD.gn b/services/loopevent/BUILD.gn index 428012ab3bed0d724ff5013b15735850dfda9b10..8ad82da8f856a3b93c6f523dabcaf2dd788ca987 100644 --- a/services/loopevent/BUILD.gn +++ b/services/loopevent/BUILD.gn @@ -25,9 +25,9 @@ common_sources = [ ] common_include = [ - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/services/include", + "//base/startup/init/services/log", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/services/include", "//third_party/bounds_checking_function/include", "include", "loop", @@ -40,7 +40,7 @@ common_include = [ config("exported_header_files") { visibility = [ ":*" ] - include_dirs = [ "//base/startup/init_lite/services/loopevent/include" ] + include_dirs = [ "//base/startup/init/services/loopevent/include" ] } if (defined(ohos_lite)) { diff --git a/services/modules/BUILD.gn b/services/modules/BUILD.gn index c8e478ad6aad578d0cbb5cc630ab0ad061a574cd..485a287b78bc17f9e8840d7c28546566ab0c5096 100755 --- a/services/modules/BUILD.gn +++ b/services/modules/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. if (!defined(ohos_lite)) { - import("//base/startup/init_lite/begetd.gni") + import("//base/startup/init/begetd.gni") import("//build/ohos.gni") ohos_shared_library("bootchart") { @@ -20,11 +20,11 @@ if (!defined(ohos_lite)) { include_dirs = [ ".", - "//base/startup/init_lite/services/include/param", + "//base/startup/init/services/include/param", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_shared", "//third_party/cJSON:cjson_static", ] @@ -46,7 +46,7 @@ if (!defined(ohos_lite)) { ohos_source_set("libbootchart_static") { sources = [ "bootchart/bootchart_static.c" ] public_configs = [ ":libbootchart_static_config" ] - public_configs += [ "//base/startup/init_lite/interfaces/innerkits/init_module_engine:init_module_engine_exported_config" ] + public_configs += [ "//base/startup/init/interfaces/innerkits/init_module_engine:init_module_engine_exported_config" ] } } diff --git a/services/modules/bootevent/BUILD.gn b/services/modules/bootevent/BUILD.gn index 782d0bbc932a5720d5ca8ef3d91efc634ae384fa..631b03156f5878e2a698b1bba0bc725bcbddd69c 100755 --- a/services/modules/bootevent/BUILD.gn +++ b/services/modules/bootevent/BUILD.gn @@ -15,15 +15,15 @@ import("//build/ohos.gni") config("bootevent_static_config") { include_dirs = [ - "//base/startup/init_lite/services/param/linux", - "//base/startup/init_lite/services/loopevent/include", - "//base/startup/init_lite/services/param/include", - "//base/startup/init_lite/services/include/param", + "//base/startup/init/services/param/linux", + "//base/startup/init/services/loopevent/include", + "//base/startup/init/services/param/include", + "//base/startup/init/services/include/param", ] } ohos_source_set("libbootevent_static") { sources = [ "bootevent.c" ] public_configs = [ ":bootevent_static_config" ] - public_configs += [ "//base/startup/init_lite/interfaces/innerkits/init_module_engine:init_module_engine_exported_config" ] + public_configs += [ "//base/startup/init/interfaces/innerkits/init_module_engine:init_module_engine_exported_config" ] } diff --git a/services/param/BUILD.gn b/services/param/BUILD.gn index 2163b3deb64202f6d7bef9e337e558c98ba9ea54..f32bf01adbebd4c7e80757a8067711adfc86c520 100755 --- a/services/param/BUILD.gn +++ b/services/param/BUILD.gn @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") group("parameter") { deps = [] diff --git a/services/param/base/BUILD.gn b/services/param/base/BUILD.gn index fc91250a2df644a9ebb502120afd4d1adcb1cb6b..2088269d9fbcccdf17690e5be2b06f7b9a04afae 100644 --- a/services/param/base/BUILD.gn +++ b/services/param/base/BUILD.gn @@ -10,34 +10,34 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") import("//build/ohos.gni") config("exported_header_files") { visibility = [ ":*" ] include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/loopevent/include", - "//base/startup/init_lite/services/log", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/services/include/param", + "//base/startup/init/services/include", + "//base/startup/init/services/loopevent/include", + "//base/startup/init/services/log", ] } base_sources = [ - "//base/startup/init_lite/services/log/init_commlog.c", - "//base/startup/init_lite/services/param/base/param_base.c", - "//base/startup/init_lite/services/param/base/param_comm.c", - "//base/startup/init_lite/services/param/base/param_trie.c", - "//base/startup/init_lite/services/utils/init_hashmap.c", - "//base/startup/init_lite/services/utils/list.c", + "//base/startup/init/services/log/init_commlog.c", + "//base/startup/init/services/param/base/param_base.c", + "//base/startup/init/services/param/base/param_comm.c", + "//base/startup/init/services/param/base/param_trie.c", + "//base/startup/init/services/utils/init_hashmap.c", + "//base/startup/init/services/utils/list.c", ] base_include_dirs = [ - "//base/startup/init_lite/services/param/include", - "//base/startup/init_lite/services/param/adapter", - "//base/startup/init_lite/services/param/linux", - "//base/startup/init_lite/services/param/base", + "//base/startup/init/services/param/include", + "//base/startup/init/services/param/adapter", + "//base/startup/init/services/param/linux", + "//base/startup/init/services/param/base", "//base/security/selinux/interfaces/policycoreutils/include", ] @@ -51,8 +51,8 @@ if (defined(ohos_lite)) { if (ohos_kernel_type == "linux") { sources += [ - "//base/startup/init_lite/services/param/adapter/param_dac.c", - "//base/startup/init_lite/services/param/linux/param_osadp.c", + "//base/startup/init/services/param/adapter/param_dac.c", + "//base/startup/init/services/param/linux/param_osadp.c", ] defines += [ "__LINUX__", @@ -60,8 +60,8 @@ if (defined(ohos_lite)) { ] } else if (ohos_kernel_type == "liteos_a") { sources += [ - "//base/startup/init_lite/services/param/liteos/param_litedac.c", - "//base/startup/init_lite/services/param/liteos/param_osadp.c", + "//base/startup/init/services/param/liteos/param_litedac.c", + "//base/startup/init/services/param/liteos/param_osadp.c", ] include_dirs += [ "//third_party/bounds_checking_function/include" ] defines += [ @@ -76,8 +76,8 @@ if (defined(ohos_lite)) { ohos_static_library("parameterbase") { sources = base_sources sources += [ - "//base/startup/init_lite/services/param/adapter/param_dac.c", - "//base/startup/init_lite/services/param/linux/param_osadp.c", + "//base/startup/init/services/param/adapter/param_dac.c", + "//base/startup/init/services/param/linux/param_osadp.c", ] cflags = [ "-fPIC" ] include_dirs = base_include_dirs @@ -95,7 +95,7 @@ if (defined(ohos_lite)) { "//base/security/selinux/interfaces/policycoreutils/include/", ] sources += - [ "//base/startup/init_lite/services/param/adapter/param_selinux.c" ] + [ "//base/startup/init/services/param/adapter/param_selinux.c" ] defines += [ "PARAM_SUPPORT_SELINUX", "PARAMWORKSPACE_NEED_MUTEX", diff --git a/services/param/linux/BUILD.gn b/services/param/linux/BUILD.gn index 95673eb6e18c779cb6b06a269f925f95dfbb41b4..175743681a5ccc6e31a9c934b84af0d534ed1ac0 100755 --- a/services/param/linux/BUILD.gn +++ b/services/param/linux/BUILD.gn @@ -10,29 +10,29 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") import("//build/ohos.gni") config("exported_header_files") { visibility = [ ":*" ] include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/service/include/param", - "//base/startup/init_lite/interfaces/service/param/include", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/interfaces/service/include/param", + "//base/startup/init/interfaces/service/param/include", ] } param_include_dirs = [ - "//base/startup/init_lite/services/param/include", - "//base/startup/init_lite/services/param/adapter", - "//base/startup/init_lite/services/param/linux", - "//base/startup/init_lite/services/param/base", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/init/include", - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/interfaces/innerkits/init_module_engine/include", - "//base/startup/init_lite/services/loopevent/include", + "//base/startup/init/services/param/include", + "//base/startup/init/services/param/adapter", + "//base/startup/init/services/param/linux", + "//base/startup/init/services/param/base", + "//base/startup/init/services/include/param", + "//base/startup/init/services/include", + "//base/startup/init/services/init/include", + "//base/startup/init/services/log", + "//base/startup/init/interfaces/innerkits/init_module_engine/include", + "//base/startup/init/services/loopevent/include", "//third_party/bounds_checking_function/include", "//third_party/cJSON", "//utils/native/lite/include", @@ -40,25 +40,25 @@ param_include_dirs = [ ] param_service_sources = [ - "//base/startup/init_lite/services/param/adapter/param_persistadp.c", - "//base/startup/init_lite/services/param/linux/param_message.c", - "//base/startup/init_lite/services/param/linux/param_msgadp.c", - "//base/startup/init_lite/services/param/linux/param_service.c", - "//base/startup/init_lite/services/param/manager/param_manager.c", - "//base/startup/init_lite/services/param/manager/param_persist.c", - "//base/startup/init_lite/services/param/manager/param_server.c", + "//base/startup/init/services/param/adapter/param_persistadp.c", + "//base/startup/init/services/param/linux/param_message.c", + "//base/startup/init/services/param/linux/param_msgadp.c", + "//base/startup/init/services/param/linux/param_service.c", + "//base/startup/init/services/param/manager/param_manager.c", + "//base/startup/init/services/param/manager/param_persist.c", + "//base/startup/init/services/param/manager/param_server.c", ] param_trigger_sources = [ - "//base/startup/init_lite/services/param/trigger/trigger_checker.c", - "//base/startup/init_lite/services/param/trigger/trigger_manager.c", - "//base/startup/init_lite/services/param/trigger/trigger_processor.c", + "//base/startup/init/services/param/trigger/trigger_checker.c", + "//base/startup/init/services/param/trigger/trigger_manager.c", + "//base/startup/init/services/param/trigger/trigger_processor.c", ] param_client_sources = [ - "//base/startup/init_lite/services/param/linux/param_message.c", - "//base/startup/init_lite/services/param/linux/param_request.c", - "//base/startup/init_lite/services/param/manager/param_manager.c", + "//base/startup/init/services/param/linux/param_message.c", + "//base/startup/init/services/param/linux/param_request.c", + "//base/startup/init/services/param/manager/param_manager.c", ] # only for linux diff --git a/services/param/liteos/BUILD.gn b/services/param/liteos/BUILD.gn index 6e29ab905a45f76c5c5b51a4b5c5038cc87cc5b4..ccea8c344b56e7e9c96b1e8cabd42422dd1219b8 100644 --- a/services/param/liteos/BUILD.gn +++ b/services/param/liteos/BUILD.gn @@ -10,17 +10,17 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") param_include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include/syspara", - "//base/startup/init_lite/services/param/include", - "//base/startup/init_lite/services/param/adapter", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/init/include", - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/services/loopevent/include", + "//base/startup/init/interfaces/innerkits/include/syspara", + "//base/startup/init/services/param/include", + "//base/startup/init/services/param/adapter", + "//base/startup/init/services/include/param", + "//base/startup/init/services/include", + "//base/startup/init/services/init/include", + "//base/startup/init/services/log", + "//base/startup/init/services/loopevent/include", "//third_party/bounds_checking_function/include", "//third_party/cJSON", "//utils/native/lite/include", @@ -37,17 +37,17 @@ param_build_defines = [ ] action("lite_ohos_param_to") { - script = "//base/startup/init_lite/scripts/param_cfg_to_code.py" + script = "//base/startup/init/scripts/param_cfg_to_code.py" args = [ "--source", rebase_path( - "//base/startup/init_lite/services/etc_lite/param/ohos_const/ohos.para"), + "//base/startup/init/services/etc_lite/param/ohos_const/ohos.para"), "--source", rebase_path("$ohos_product_adapter_dir/utils/sys_param/vendor.para"), "--source", - rebase_path("//base/startup/init_lite/services/etc/param/ohos.para"), + rebase_path("//base/startup/init/services/etc/param/ohos.para"), "--dest_dir", - rebase_path("$root_out_dir/gen/init_lite/"), + rebase_path("$root_out_dir/gen/init/"), ] outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ] } @@ -55,32 +55,32 @@ action("lite_ohos_param_to") { config("exported_header_files") { visibility = [ ":*" ] include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/service/include/param", - "//base/startup/init_lite/interfaces/service/param/include", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/interfaces/service/include/param", + "//base/startup/init/interfaces/service/param/include", ] } base_sources = [ - "//base/startup/init_lite/services/log/init_commlog.c", - "//base/startup/init_lite/services/param/base/param_base.c", - "//base/startup/init_lite/services/param/base/param_comm.c", - "//base/startup/init_lite/services/param/base/param_trie.c", - "//base/startup/init_lite/services/param/liteos/param_client.c", - "//base/startup/init_lite/services/param/liteos/param_litedac.c", - "//base/startup/init_lite/services/param/liteos/param_osadp.c", - "//base/startup/init_lite/services/param/manager/param_manager.c", - "//base/startup/init_lite/services/param/manager/param_persist.c", - "//base/startup/init_lite/services/utils/init_hashmap.c", - "//base/startup/init_lite/services/utils/list.c", + "//base/startup/init/services/log/init_commlog.c", + "//base/startup/init/services/param/base/param_base.c", + "//base/startup/init/services/param/base/param_comm.c", + "//base/startup/init/services/param/base/param_trie.c", + "//base/startup/init/services/param/liteos/param_client.c", + "//base/startup/init/services/param/liteos/param_litedac.c", + "//base/startup/init/services/param/liteos/param_osadp.c", + "//base/startup/init/services/param/manager/param_manager.c", + "//base/startup/init/services/param/manager/param_persist.c", + "//base/startup/init/services/utils/init_hashmap.c", + "//base/startup/init/services/utils/list.c", ] static_library("param_init_lite") { defines = [] deps = [] sources = [ - "//base/startup/init_lite/services/param/manager/param_manager.c", - "//base/startup/init_lite/services/param/manager/param_server.c", + "//base/startup/init/services/param/manager/param_manager.c", + "//base/startup/init/services/param/manager/param_server.c", ] include_dirs = param_include_dirs defines += param_build_defines @@ -88,9 +88,9 @@ static_library("param_init_lite") { if (ohos_kernel_type == "liteos_a") { sources += [ - "//base/startup/init_lite/services/param/adapter/param_persistadp.c", - "//base/startup/init_lite/services/param/liteos/param_service.c", - "//base/startup/init_lite/services/param/manager/param_persist.c", + "//base/startup/init/services/param/adapter/param_persistadp.c", + "//base/startup/init/services/param/liteos/param_service.c", + "//base/startup/init/services/param/manager/param_persist.c", ] defines += [ "WORKSPACE_AREA_NEED_MUTEX", @@ -111,7 +111,7 @@ static_library("param_client_lite") { if (ohos_kernel_type == "liteos_a") { sources += - [ "//base/startup/init_lite/services/param/adapter/param_persistadp.c" ] + [ "//base/startup/init/services/param/adapter/param_persistadp.c" ] defines += [ "__LITEOS_A__", "WORKSPACE_AREA_NEED_MUTEX", @@ -121,9 +121,9 @@ static_library("param_client_lite") { ] } else if (ohos_kernel_type == "liteos_m") { sources += [ - "//base/startup/init_lite/services/param/liteos/param_hal.c", - "//base/startup/init_lite/services/param/liteos/param_service.c", - "//base/startup/init_lite/services/param/manager/param_server.c", + "//base/startup/init/services/param/liteos/param_hal.c", + "//base/startup/init/services/param/liteos/param_service.c", + "//base/startup/init/services/param/manager/param_server.c", ] if (enable_ohos_startup_init_lite_use_posix_file_api) { defines += [ "PARAM_SUPPORT_POSIX" ] @@ -139,7 +139,7 @@ static_library("param_client_lite") { } if (enable_ohos_startup_init_feature_begetctl_liteos) { deps = [ ":lite_ohos_param_to" ] - include_dirs += [ "$root_out_dir/gen/init_lite" ] + include_dirs += [ "$root_out_dir/gen/init" ] defines += [ "PARAM_LOAD_CFG_FROM_CODE" ] } } diff --git a/services/param/watcher/BUILD.gn b/services/param/watcher/BUILD.gn index 5dccf1374cdbfe3bddd58a47bce73f4264396b6b..6a7825e3463b5f850e52d997ca3169e1fd8e7603 100644 --- a/services/param/watcher/BUILD.gn +++ b/services/param/watcher/BUILD.gn @@ -20,27 +20,27 @@ ohos_prebuilt_etc("param_watcher.rc") { ohos_shared_library("param_watcher") { sources = [ - "//base/startup/init_lite/services/utils/list.c", + "//base/startup/init/services/utils/list.c", "proxy/watcher_manager.cpp", "proxy/watcher_manager_stub.cpp", "proxy/watcher_proxy.cpp", ] include_dirs = [ - "//base/startup/init_lite/services/param/include", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/services/param/linux", - "//base/startup/init_lite/services/param/watcher/proxy", - "//base/startup/init_lite/services/param/watcher/include", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/services/loopevent/include", + "//base/startup/init/services/param/include", + "//base/startup/init/services/include/param", + "//base/startup/init/services/param/linux", + "//base/startup/init/services/param/watcher/proxy", + "//base/startup/init/services/param/watcher/include", + "//base/startup/init/services/include", + "//base/startup/init/services/log", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/services/loopevent/include", "//third_party/cJSON", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_shared", ] diff --git a/services/utils/BUILD.gn b/services/utils/BUILD.gn index b6cf39758edb354e769f345b4f25ed9a14bef35a..e120147c3065972e9c51f2896d9d95dda36d0b49 100755 --- a/services/utils/BUILD.gn +++ b/services/utils/BUILD.gn @@ -14,8 +14,8 @@ config("exported_header_files") { visibility = [ ":*" ] include_dirs = [ - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/log", + "//base/startup/init/services/include", + "//base/startup/init/services/log", ] } @@ -24,7 +24,7 @@ if (defined(ohos_lite)) { sources = [ "init_utils.c" ] public_configs = [ ":exported_header_files" ] include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/include", "//third_party/bounds_checking_function/include", ] defines = [ @@ -38,7 +38,7 @@ if (defined(ohos_lite)) { sources = [ "init_utils.c" ] public_configs = [ ":exported_header_files" ] include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/include", "//third_party/bounds_checking_function/include", ] defines = [ "_GNU_SOURCE" ] diff --git a/test/BUILD.gn b/test/BUILD.gn index e80d52fdabade4a4e70bce309c190d6c2263d553..32f5590f7c01ed1dda0905aab20748279cca2a92 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") group("testgroup") { testonly = true diff --git a/test/exec_test/BUILD.gn b/test/exec_test/BUILD.gn index 28b9859c9432489ab47b89ce1975b8deee349d7c..e1dae1f9d2989bbf07fee0cb6e84264e6cdfc05a 100644 --- a/test/exec_test/BUILD.gn +++ b/test/exec_test/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") import("//build/ohos.gni") ohos_executable("client") { sources = [ "client.c" ] include_dirs = [ - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/interfaces/innerkits/include", + "//base/startup/init/services/log", + "//base/startup/init/interfaces/innerkits/include", "//third_party/bounds_checking_function/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_static", ] install_images = [ "system" ] @@ -35,9 +35,9 @@ ohos_executable("fd_holder_test") { defines = [ "INIT_AGENT" ] - deps = [ "//base/startup/init_lite/interfaces/innerkits:libbegetutil" ] + deps = [ "//base/startup/init/interfaces/innerkits:libbegetutil" ] - include_dirs = [ "//base/startup/init_lite/interfaces/innerkits/include" ] + include_dirs = [ "//base/startup/init/interfaces/innerkits/include" ] install_images = [ "system" ] install_enable = true @@ -46,7 +46,7 @@ ohos_executable("fd_holder_test") { } ohos_prebuilt_etc("fd_holder_test.cfg") { - source = "//base/startup/init_lite/test/exec_test/fd_holder_test.cfg" + source = "//base/startup/init/test/exec_test/fd_holder_test.cfg" part_name = "init" module_install_dir = "etc/init" } @@ -54,12 +54,12 @@ ohos_prebuilt_etc("fd_holder_test.cfg") { ohos_executable("server") { sources = [ "server.c" ] include_dirs = [ - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/interfaces/innerkits/include", + "//base/startup/init/services/log", + "//base/startup/init/interfaces/innerkits/include", "//third_party/bounds_checking_function/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_static", ] install_images = [ "system" ] diff --git a/test/fuzztest/BUILD.gn b/test/fuzztest/BUILD.gn index fa196f6202f49b2e5e7961b2237f4b61526716e2..9b61a03c90c8a0f4345b64bdbc039efc4233814f 100644 --- a/test/fuzztest/BUILD.gn +++ b/test/fuzztest/BUILD.gn @@ -20,7 +20,7 @@ import("//build/test.gni") ohos_static_library("libfuzz_utils") { sources = [ "utils/fuzz_utils.cpp" ] - include_dirs = [ "//base/startup/init_lite/test/fuzztest/utils/include" ] + include_dirs = [ "//base/startup/init/test/fuzztest/utils/include" ] deps = [] part_name = "init" @@ -29,15 +29,15 @@ ohos_static_library("libfuzz_utils") { ##############################fuzztest########################################## ohos_fuzztest("DoRebootFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/startup/init_lite/test/fuzztest/doreboot_fuzzer" + fuzz_config_file = "//base/startup/init/test/fuzztest/doreboot_fuzzer" include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_static", ] @@ -54,16 +54,15 @@ ohos_fuzztest("DoRebootFuzzTest") { ohos_fuzztest("GetControlFileFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/getcontrolfile_fuzzer" + fuzz_config_file = "//base/startup/init/test/fuzztest/getcontrolfile_fuzzer" include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_static", ] @@ -80,17 +79,16 @@ ohos_fuzztest("GetControlFileFuzzTest") { ohos_fuzztest("GetControlSocketFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/getcontrolsocket_fuzzer" + fuzz_config_file = "//base/startup/init/test/fuzztest/getcontrolsocket_fuzzer" include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", - "//base/startup/init_lite/services/log:init_log", + "//base/startup/init/interfaces/innerkits:libbegetutil", + "//base/startup/init/services/log:init_log", "//third_party/bounds_checking_function:libsec_static", ] @@ -107,17 +105,16 @@ ohos_fuzztest("GetControlSocketFuzzTest") { ohos_fuzztest("MountAllFstabFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/mountallfstab_fuzzer" + fuzz_config_file = "//base/startup/init/test/fuzztest/mountallfstab_fuzzer" include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", - "//base/startup/init_lite/test/fuzztest:libfuzz_utils", + "//base/startup/init/interfaces/innerkits:libbegetutil", + "//base/startup/init/test/fuzztest:libfuzz_utils", "//third_party/bounds_checking_function:libsec_static", ] @@ -134,17 +131,16 @@ ohos_fuzztest("MountAllFstabFuzzTest") { ohos_fuzztest("ReadFileInDirFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/readfileindir_fuzzer" + fuzz_config_file = "//base/startup/init/test/fuzztest/readfileindir_fuzzer" include_dirs = [ - "//base/startup/init_lite/services/init/include", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/services/init/include", + "//base/startup/init/services/include", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_static", ] @@ -162,13 +158,13 @@ ohos_fuzztest("ReadFileInDirFuzzTest") { ohos_fuzztest("ServiceControlStartFuzzTest") { module_out_path = module_output_path fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/servicecontrolstart_fuzzer" + "//base/startup/init/test/fuzztest/servicecontrolstart_fuzzer" include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/test/fuzztest/utils/include", ] - deps = [ "//base/startup/init_lite/interfaces/innerkits:libbegetutil" ] + deps = [ "//base/startup/init/interfaces/innerkits:libbegetutil" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] cflags = [ @@ -185,13 +181,13 @@ ohos_fuzztest("ServiceControlStartFuzzTest") { ohos_fuzztest("ServiceControlStopFuzzTest") { module_out_path = module_output_path fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/servicecontrolstop_fuzzer" + "//base/startup/init/test/fuzztest/servicecontrolstop_fuzzer" include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/test/fuzztest/utils/include", ] - deps = [ "//base/startup/init_lite/interfaces/innerkits:libbegetutil" ] + deps = [ "//base/startup/init/interfaces/innerkits:libbegetutil" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] cflags = [ @@ -208,16 +204,16 @@ ohos_fuzztest("ServiceControlStopFuzzTest") { ohos_fuzztest("SystemDumpParametersFuzzTest") { module_out_path = module_output_path fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/systemdumpparameters_fuzzer" + "//base/startup/init/test/fuzztest/systemdumpparameters_fuzzer" include_dirs = [ - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/services/include/param", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", - "//base/startup/init_lite/test/fuzztest:libfuzz_utils", + "//base/startup/init/interfaces/innerkits:libbegetutil", + "//base/startup/init/test/fuzztest:libfuzz_utils", "//third_party/bounds_checking_function:libsec_static", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] @@ -236,15 +232,15 @@ ohos_fuzztest("SystemDumpParametersFuzzTest") { ohos_fuzztest("SystemFindParameterFuzzTest") { module_out_path = module_output_path fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/systemfindparameter_fuzzer" + "//base/startup/init/test/fuzztest/systemfindparameter_fuzzer" include_dirs = [ - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/services/include/param", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_static", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] @@ -263,15 +259,15 @@ ohos_fuzztest("SystemFindParameterFuzzTest") { ohos_fuzztest("SystemGetParameterFuzzTest") { module_out_path = module_output_path fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/systemgetparameter_fuzzer" + "//base/startup/init/test/fuzztest/systemgetparameter_fuzzer" include_dirs = [ - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/services/include/param", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_static", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] @@ -290,15 +286,15 @@ ohos_fuzztest("SystemGetParameterFuzzTest") { ohos_fuzztest("SystemGetParameterCommitIdFuzzTest") { module_out_path = module_output_path fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/systemgetparametercommitid_fuzzer" + "//base/startup/init/test/fuzztest/systemgetparametercommitid_fuzzer" include_dirs = [ - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/services/include/param", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_static", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] @@ -319,15 +315,15 @@ ohos_fuzztest("SystemGetParameterCommitIdFuzzTest") { ohos_fuzztest("SystemGetParameterNameFuzzTest") { module_out_path = module_output_path fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/systemgetparametername_fuzzer" + "//base/startup/init/test/fuzztest/systemgetparametername_fuzzer" include_dirs = [ - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/services/include/param", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_static", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] @@ -347,15 +343,15 @@ ohos_fuzztest("SystemGetParameterNameFuzzTest") { ohos_fuzztest("SystemGetParameterValueFuzzTest") { module_out_path = module_output_path fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/systemgetparametervalue_fuzzer" + "//base/startup/init/test/fuzztest/systemgetparametervalue_fuzzer" include_dirs = [ - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/services/include/param", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_static", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] @@ -375,15 +371,15 @@ ohos_fuzztest("SystemGetParameterValueFuzzTest") { ohos_fuzztest("SystemSetParameterFuzzTest") { module_out_path = module_output_path fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/systemsetparameter_fuzzer" + "//base/startup/init/test/fuzztest/systemsetparameter_fuzzer" include_dirs = [ - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/services/include/param", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_static", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] @@ -402,18 +398,18 @@ ohos_fuzztest("SystemSetParameterFuzzTest") { ohos_fuzztest("SystemTraversalParameterFuzzTest") { module_out_path = module_output_path fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/systemtraversalparameter_fuzzer" + "//base/startup/init/test/fuzztest/systemtraversalparameter_fuzzer" include_dirs = [ - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/services/init/include", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/services/include/param", + "//base/startup/init/services/init/include", + "//base/startup/init/test/fuzztest/utils/include", "//third_party/bounds_checking_function/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", - "//base/startup/init_lite/test/fuzztest:libfuzz_utils", + "//base/startup/init/interfaces/innerkits:libbegetutil", + "//base/startup/init/test/fuzztest:libfuzz_utils", "//third_party/bounds_checking_function:libsec_static", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] @@ -433,15 +429,15 @@ ohos_fuzztest("SystemTraversalParameterFuzzTest") { ohos_fuzztest("SystemWaitParameterFuzzTest") { module_out_path = module_output_path fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/systemwaitparameter_fuzzer" + "//base/startup/init/test/fuzztest/systemwaitparameter_fuzzer" include_dirs = [ - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/services/include/param", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_static", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] @@ -460,17 +456,17 @@ ohos_fuzztest("SystemWaitParameterFuzzTest") { ohos_fuzztest("SystemWatchParameterFuzzTest") { module_out_path = module_output_path fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/systemwatchparameter_fuzzer" + "//base/startup/init/test/fuzztest/systemwatchparameter_fuzzer" include_dirs = [ - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/services/init/include", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/services/include/param", + "//base/startup/init/services/init/include", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbeget_proxy", - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", + "//base/startup/init/interfaces/innerkits:libbeget_proxy", + "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/bounds_checking_function:libsec_static", "//utils/native/base:utils", ] @@ -495,17 +491,16 @@ ohos_fuzztest("SystemWatchParameterFuzzTest") { ohos_fuzztest("UmountAllFstabFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "//base/startup/init_lite/test/fuzztest/umountallfstab_fuzzer" + fuzz_config_file = "//base/startup/init/test/fuzztest/umountallfstab_fuzzer" include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/test/fuzztest/utils/include", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/test/fuzztest/utils/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", - "//base/startup/init_lite/test/fuzztest:libfuzz_utils", + "//base/startup/init/interfaces/innerkits:libbegetutil", + "//base/startup/init/test/fuzztest:libfuzz_utils", "//third_party/bounds_checking_function:libsec_static", ] diff --git a/test/moduletest/BUILD.gn b/test/moduletest/BUILD.gn index 492102c05cf089caa04ba4d2853c8c165df920e2..a46c696464099d23fb361ffde30ad389ce43f273 100755 --- a/test/moduletest/BUILD.gn +++ b/test/moduletest/BUILD.gn @@ -11,27 +11,27 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") import("//build/ohos.gni") ohos_shared_library("libparamtestmodule") { sources = [ "param_test_module.c" ] include_dirs = [ - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/init/include", - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/services/loopevent/include", - "//base/startup/init_lite/ueventd/include", + "//base/startup/init/services/include/param", + "//base/startup/init/services/include", + "//base/startup/init/services/init/include", + "//base/startup/init/services/log", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/services/loopevent/include", + "//base/startup/init/ueventd/include", "//third_party/cJSON", "//third_party/bounds_checking_function/include", ] deps = [ - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", - "//base/startup/init_lite/services/log:agent_log", + "//base/startup/init/interfaces/innerkits:libbegetutil", + "//base/startup/init/services/log:agent_log", "//third_party/bounds_checking_function:libsec_shared", ] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index ab97ffa121741d46b8a5e3a43cab7752726734bb..6c6c4615a42f28b9f923db6a86b92868814d1e92 100755 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -10,7 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/init_lite/begetd.gni") +import("//base/startup/init/begetd.gni") import("//build/test.gni") config("utest_config") { @@ -33,92 +33,91 @@ config("utest_config") { ohos_unittest("init_unittest") { module_out_path = "startup/init" sources = [ - "//base/startup/init_lite/device_info/device_info.cpp", - "//base/startup/init_lite/device_info/device_info_stub.cpp", - "//base/startup/init_lite/interfaces/innerkits/file/init_file.c", - "//base/startup/init_lite/interfaces/innerkits/fs_manager/fstab.c", - "//base/startup/init_lite/interfaces/innerkits/fs_manager/fstab_mount.c", - "//base/startup/init_lite/interfaces/innerkits/reboot/init_reboot_innerkits.c", - "//base/startup/init_lite/interfaces/innerkits/sandbox/sandbox.c", - "//base/startup/init_lite/interfaces/innerkits/sandbox/sandbox_namespace.c", - "//base/startup/init_lite/interfaces/innerkits/socket/init_socket.c", - "//base/startup/init_lite/interfaces/innerkits/syspara/param_comm.c", - "//base/startup/init_lite/interfaces/innerkits/syspara/parameter.c", - "//base/startup/init_lite/interfaces/innerkits/syspara/sysversion.c", - "//base/startup/init_lite/services/begetctl/param_cmd.c", - "//base/startup/init_lite/services/begetctl/shell/shell_bas.c", - "//base/startup/init_lite/services/begetctl/shell/shell_main.c", - "//base/startup/init_lite/services/init/adapter/init_adapter.c", - "//base/startup/init_lite/services/init/init_capability.c", - "//base/startup/init_lite/services/init/init_common_cmds.c", - "//base/startup/init_lite/services/init/init_common_service.c", - "//base/startup/init_lite/services/init/init_config.c", - "//base/startup/init_lite/services/init/init_group_manager.c", - "//base/startup/init_lite/services/init/init_service_file.c", - "//base/startup/init_lite/services/init/init_service_manager.c", - "//base/startup/init_lite/services/init/init_service_socket.c", - "//base/startup/init_lite/services/init/standard/device.c", - "//base/startup/init_lite/services/init/standard/init.c", - "//base/startup/init_lite/services/init/standard/init_cmdexecutor.c", - "//base/startup/init_lite/services/init/standard/init_cmds.c", - "//base/startup/init_lite/services/init/standard/init_jobs.c", - "//base/startup/init_lite/services/init/standard/init_mount.c", - "//base/startup/init_lite/services/init/standard/init_reboot.c", - "//base/startup/init_lite/services/init/standard/init_service.c", - "//base/startup/init_lite/services/init/standard/init_signal_handler.c", - "//base/startup/init_lite/services/log/init_commlog.c", - "//base/startup/init_lite/services/log/init_log.c", - "//base/startup/init_lite/services/loopevent/loop/le_epoll.c", - "//base/startup/init_lite/services/loopevent/loop/le_loop.c", - "//base/startup/init_lite/services/loopevent/signal/le_signal.c", - "//base/startup/init_lite/services/loopevent/socket/le_socket.c", - "//base/startup/init_lite/services/loopevent/task/le_asynctask.c", - "//base/startup/init_lite/services/loopevent/task/le_streamtask.c", - "//base/startup/init_lite/services/loopevent/task/le_task.c", - "//base/startup/init_lite/services/loopevent/task/le_watchtask.c", - "//base/startup/init_lite/services/loopevent/timer/le_timer.c", - "//base/startup/init_lite/services/loopevent/utils/le_utils.c", - "//base/startup/init_lite/services/param/adapter/param_dac.c", - "//base/startup/init_lite/services/param/adapter/param_persistadp.c", - "//base/startup/init_lite/services/param/base/param_base.c", - "//base/startup/init_lite/services/param/base/param_comm.c", - "//base/startup/init_lite/services/param/base/param_trie.c", - "//base/startup/init_lite/services/param/linux/param_message.c", - "//base/startup/init_lite/services/param/linux/param_msgadp.c", - "//base/startup/init_lite/services/param/linux/param_osadp.c", - "//base/startup/init_lite/services/param/linux/param_request.c", - "//base/startup/init_lite/services/param/linux/param_service.c", - "//base/startup/init_lite/services/param/manager/param_manager.c", - "//base/startup/init_lite/services/param/manager/param_persist.c", - "//base/startup/init_lite/services/param/manager/param_server.c", - "//base/startup/init_lite/services/param/trigger/trigger_checker.c", - "//base/startup/init_lite/services/param/trigger/trigger_manager.c", - "//base/startup/init_lite/services/param/trigger/trigger_processor.c", - "//base/startup/init_lite/services/utils/init_hashmap.c", - "//base/startup/init_lite/services/utils/init_utils.c", - "//base/startup/init_lite/services/utils/list.c", - "//base/startup/init_lite/ueventd/standard/ueventd_parameter.c", - "//base/startup/init_lite/ueventd/ueventd.c", - "//base/startup/init_lite/ueventd/ueventd_device_handler.c", - "//base/startup/init_lite/ueventd/ueventd_firmware_handler.c", - "//base/startup/init_lite/ueventd/ueventd_read_cfg.c", - "//base/startup/init_lite/ueventd/ueventd_socket.c", + "//base/startup/init/device_info/device_info.cpp", + "//base/startup/init/device_info/device_info_stub.cpp", + "//base/startup/init/interfaces/innerkits/file/init_file.c", + "//base/startup/init/interfaces/innerkits/fs_manager/fstab.c", + "//base/startup/init/interfaces/innerkits/fs_manager/fstab_mount.c", + "//base/startup/init/interfaces/innerkits/reboot/init_reboot_innerkits.c", + "//base/startup/init/interfaces/innerkits/sandbox/sandbox.c", + "//base/startup/init/interfaces/innerkits/sandbox/sandbox_namespace.c", + "//base/startup/init/interfaces/innerkits/socket/init_socket.c", + "//base/startup/init/interfaces/innerkits/syspara/param_comm.c", + "//base/startup/init/interfaces/innerkits/syspara/parameter.c", + "//base/startup/init/interfaces/innerkits/syspara/sysversion.c", + "//base/startup/init/services/begetctl/param_cmd.c", + "//base/startup/init/services/begetctl/shell/shell_bas.c", + "//base/startup/init/services/begetctl/shell/shell_main.c", + "//base/startup/init/services/init/adapter/init_adapter.c", + "//base/startup/init/services/init/init_capability.c", + "//base/startup/init/services/init/init_common_cmds.c", + "//base/startup/init/services/init/init_common_service.c", + "//base/startup/init/services/init/init_config.c", + "//base/startup/init/services/init/init_group_manager.c", + "//base/startup/init/services/init/init_service_file.c", + "//base/startup/init/services/init/init_service_manager.c", + "//base/startup/init/services/init/init_service_socket.c", + "//base/startup/init/services/init/standard/device.c", + "//base/startup/init/services/init/standard/init.c", + "//base/startup/init/services/init/standard/init_cmdexecutor.c", + "//base/startup/init/services/init/standard/init_cmds.c", + "//base/startup/init/services/init/standard/init_jobs.c", + "//base/startup/init/services/init/standard/init_mount.c", + "//base/startup/init/services/init/standard/init_reboot.c", + "//base/startup/init/services/init/standard/init_service.c", + "//base/startup/init/services/init/standard/init_signal_handler.c", + "//base/startup/init/services/log/init_commlog.c", + "//base/startup/init/services/log/init_log.c", + "//base/startup/init/services/loopevent/loop/le_epoll.c", + "//base/startup/init/services/loopevent/loop/le_loop.c", + "//base/startup/init/services/loopevent/signal/le_signal.c", + "//base/startup/init/services/loopevent/socket/le_socket.c", + "//base/startup/init/services/loopevent/task/le_asynctask.c", + "//base/startup/init/services/loopevent/task/le_streamtask.c", + "//base/startup/init/services/loopevent/task/le_task.c", + "//base/startup/init/services/loopevent/task/le_watchtask.c", + "//base/startup/init/services/loopevent/timer/le_timer.c", + "//base/startup/init/services/loopevent/utils/le_utils.c", + "//base/startup/init/services/param/adapter/param_dac.c", + "//base/startup/init/services/param/adapter/param_persistadp.c", + "//base/startup/init/services/param/base/param_base.c", + "//base/startup/init/services/param/base/param_comm.c", + "//base/startup/init/services/param/base/param_trie.c", + "//base/startup/init/services/param/linux/param_message.c", + "//base/startup/init/services/param/linux/param_msgadp.c", + "//base/startup/init/services/param/linux/param_osadp.c", + "//base/startup/init/services/param/linux/param_request.c", + "//base/startup/init/services/param/linux/param_service.c", + "//base/startup/init/services/param/manager/param_manager.c", + "//base/startup/init/services/param/manager/param_persist.c", + "//base/startup/init/services/param/manager/param_server.c", + "//base/startup/init/services/param/trigger/trigger_checker.c", + "//base/startup/init/services/param/trigger/trigger_manager.c", + "//base/startup/init/services/param/trigger/trigger_processor.c", + "//base/startup/init/services/utils/init_hashmap.c", + "//base/startup/init/services/utils/init_utils.c", + "//base/startup/init/services/utils/list.c", + "//base/startup/init/ueventd/standard/ueventd_parameter.c", + "//base/startup/init/ueventd/ueventd.c", + "//base/startup/init/ueventd/ueventd_device_handler.c", + "//base/startup/init/ueventd/ueventd_firmware_handler.c", + "//base/startup/init/ueventd/ueventd_read_cfg.c", + "//base/startup/init/ueventd/ueventd_socket.c", ] if (defined(build_selinux) && build_selinux) { - sources += - [ "//base/startup/init_lite/services/param/adapter/param_selinux.c" ] + sources += [ "//base/startup/init/services/param/adapter/param_selinux.c" ] } if (enable_ohos_startup_init_feature_watcher) { sources += [ - "//base/startup/init_lite/services/param/watcher/agent/watcher.cpp", - "//base/startup/init_lite/services/param/watcher/agent/watcher_manager_kits.cpp", - "//base/startup/init_lite/services/param/watcher/agent/watcher_manager_proxy.cpp", - "//base/startup/init_lite/services/param/watcher/agent/watcher_stub.cpp", - "//base/startup/init_lite/services/param/watcher/proxy/watcher_manager.cpp", - "//base/startup/init_lite/services/param/watcher/proxy/watcher_manager_stub.cpp", - "//base/startup/init_lite/services/param/watcher/proxy/watcher_proxy.cpp", + "//base/startup/init/services/param/watcher/agent/watcher.cpp", + "//base/startup/init/services/param/watcher/agent/watcher_manager_kits.cpp", + "//base/startup/init/services/param/watcher/agent/watcher_manager_proxy.cpp", + "//base/startup/init/services/param/watcher/agent/watcher_stub.cpp", + "//base/startup/init/services/param/watcher/proxy/watcher_manager.cpp", + "//base/startup/init/services/param/watcher/proxy/watcher_manager_stub.cpp", + "//base/startup/init/services/param/watcher/proxy/watcher_proxy.cpp", ] } @@ -147,58 +146,58 @@ ohos_unittest("init_unittest") { ] sources += [ - "//base/startup/init_lite/interfaces/innerkits/hookmgr/hookmgr.c", - "//base/startup/init_lite/interfaces/innerkits/modulemgr/modulemgr.c", + "//base/startup/init/interfaces/innerkits/hookmgr/hookmgr.c", + "//base/startup/init/interfaces/innerkits/modulemgr/modulemgr.c", "innerkits/hookmgr_unittest.cpp", "innerkits/modulemgr_unittest.cpp", ] - configs = [ "//base/startup/init_lite/test/unittest:utest_config" ] + configs = [ "//base/startup/init/test/unittest:utest_config" ] include_dirs = [ "//base/customization/config_policy/interfaces/innerkits/include", - "//base/startup/init_lite/device_info", - "//base/startup/init_lite/services/init/standard", - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/innerkits/include/syspara", - "//base/startup/init_lite/interfaces/innerkits/fd_holder", - "//base/startup/init_lite/interfaces/innerkits/syspara", - "//base/startup/init_lite/interfaces/innerkits/control_fd", - "//base/startup/init_lite/services/begetctl", - "//base/startup/init_lite/services/begetctl/shell", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/init/include", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/services/loopevent/include", - "//base/startup/init_lite/services/loopevent/loop", - "//base/startup/init_lite/services/loopevent/socket", - "//base/startup/init_lite/services/loopevent/signal", - "//base/startup/init_lite/services/loopevent/task", - "//base/startup/init_lite/services/loopevent/timer", - "//base/startup/init_lite/services/loopevent/utils", - "//base/startup/init_lite/services/param/adapter", - "//base/startup/init_lite/services/param/base", - "//base/startup/init_lite/services/param/linux", - "//base/startup/init_lite/services/param/include", - "//base/startup/init_lite/services/param/watcher/agent", - "//base/startup/init_lite/services/param/watcher/include", - "//base/startup/init_lite/services/param/watcher/proxy", - "//base/startup/init_lite/test/unittest", - "//base/startup/init_lite/test/unittest/param", + "//base/startup/init/device_info", + "//base/startup/init/services/init/standard", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/include/syspara", + "//base/startup/init/interfaces/innerkits/fd_holder", + "//base/startup/init/interfaces/innerkits/syspara", + "//base/startup/init/interfaces/innerkits/control_fd", + "//base/startup/init/services/begetctl", + "//base/startup/init/services/begetctl/shell", + "//base/startup/init/services/include", + "//base/startup/init/services/init/include", + "//base/startup/init/services/include/param", + "//base/startup/init/services/log", + "//base/startup/init/services/loopevent/include", + "//base/startup/init/services/loopevent/loop", + "//base/startup/init/services/loopevent/socket", + "//base/startup/init/services/loopevent/signal", + "//base/startup/init/services/loopevent/task", + "//base/startup/init/services/loopevent/timer", + "//base/startup/init/services/loopevent/utils", + "//base/startup/init/services/param/adapter", + "//base/startup/init/services/param/base", + "//base/startup/init/services/param/linux", + "//base/startup/init/services/param/include", + "//base/startup/init/services/param/watcher/agent", + "//base/startup/init/services/param/watcher/include", + "//base/startup/init/services/param/watcher/proxy", + "//base/startup/init/test/unittest", + "//base/startup/init/test/unittest/param", "//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", - "//base/startup/init_lite/ueventd/include", + "//base/startup/init/ueventd/include", "//utils/system/safwk/native/include", "//third_party/bounds_checking_function/include", "//third_party/cJSON", "//base/security/access_token/interfaces/innerkits/token_setproc/include", "//base/security/access_token/interfaces/innerkits/nativetoken/include", - "//base/startup/init_lite/interfaces/innerkits/sandbox/include", - "//base/startup/init_lite/interfaces/innerkits/hals", + "//base/startup/init/interfaces/innerkits/sandbox/include", + "//base/startup/init/interfaces/innerkits/hals", ] deps = [ @@ -264,9 +263,9 @@ ohos_unittest("init_unittest") { } if (enable_ohos_startup_init_feature_deviceinfo) { sources += [ - "//base/startup/init_lite/device_info/device_info_kits.cpp", - "//base/startup/init_lite/device_info/device_info_load.cpp", - "//base/startup/init_lite/device_info/device_info_proxy.cpp", + "//base/startup/init/device_info/device_info_kits.cpp", + "//base/startup/init/device_info/device_info_load.cpp", + "//base/startup/init/device_info/device_info_proxy.cpp", ] defines += [ "PARAM_FEATURE_DEVICEINFO" ] external_deps += [ "access_token:libaccesstoken_sdk" ] diff --git a/test/unittest/lite/BUILD.gn b/test/unittest/lite/BUILD.gn index 060eb47ae83fd2d897ca7e3bbd5d9216d6d77da7..c00582b8d12932ac3e4e83693f77d6ceb3c8a586 100755 --- a/test/unittest/lite/BUILD.gn +++ b/test/unittest/lite/BUILD.gn @@ -11,49 +11,49 @@ # See the License for the specific language governing permissions and # limitations under the License. if (defined(ohos_lite)) { - import("//base/startup/init_lite/begetd.gni") + import("//base/startup/init/begetd.gni") import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/test.gni") if (ohos_kernel_type == "linux" || ohos_kernel_type == "liteos_a") { init_common_sources = [ - "//base/startup/init_lite/services/init/adapter/init_adapter.c", - "//base/startup/init_lite/services/init/init_capability.c", - "//base/startup/init_lite/services/init/init_common_cmds.c", - "//base/startup/init_lite/services/init/init_common_service.c", - "//base/startup/init_lite/services/init/init_config.c", - "//base/startup/init_lite/services/init/init_group_manager.c", - "//base/startup/init_lite/services/init/init_service_file.c", - "//base/startup/init_lite/services/init/init_service_manager.c", - "//base/startup/init_lite/services/init/init_service_socket.c", - "//base/startup/init_lite/services/init/lite/init.c", - "//base/startup/init_lite/services/init/lite/init_cmds.c", - "//base/startup/init_lite/services/init/lite/init_jobs.c", - "//base/startup/init_lite/services/init/lite/init_reboot.c", - "//base/startup/init_lite/services/init/lite/init_service.c", - "//base/startup/init_lite/services/init/lite/init_signal_handler.c", - "//base/startup/init_lite/services/log/init_log.c", - "//base/startup/init_lite/services/utils/init_utils.c", + "//base/startup/init/services/init/adapter/init_adapter.c", + "//base/startup/init/services/init/init_capability.c", + "//base/startup/init/services/init/init_common_cmds.c", + "//base/startup/init/services/init/init_common_service.c", + "//base/startup/init/services/init/init_config.c", + "//base/startup/init/services/init/init_group_manager.c", + "//base/startup/init/services/init/init_service_file.c", + "//base/startup/init/services/init/init_service_manager.c", + "//base/startup/init/services/init/init_service_socket.c", + "//base/startup/init/services/init/lite/init.c", + "//base/startup/init/services/init/lite/init_cmds.c", + "//base/startup/init/services/init/lite/init_jobs.c", + "//base/startup/init/services/init/lite/init_reboot.c", + "//base/startup/init/services/init/lite/init_service.c", + "//base/startup/init/services/init/lite/init_signal_handler.c", + "//base/startup/init/services/log/init_log.c", + "//base/startup/init/services/utils/init_utils.c", ] } param_common_sources = [ - "//base/startup/init_lite/services/param/manager/param_manager.c", - "//base/startup/init_lite/services/param/manager/param_persist.c", - "//base/startup/init_lite/services/param/manager/param_server.c", + "//base/startup/init/services/param/manager/param_manager.c", + "//base/startup/init/services/param/manager/param_persist.c", + "//base/startup/init/services/param/manager/param_server.c", ] base_sources = [ - "//base/startup/init_lite/services/log/init_commlog.c", - "//base/startup/init_lite/services/param/base/param_base.c", - "//base/startup/init_lite/services/param/base/param_comm.c", - "//base/startup/init_lite/services/param/base/param_trie.c", - "//base/startup/init_lite/services/utils/init_hashmap.c", - "//base/startup/init_lite/services/utils/list.c", + "//base/startup/init/services/log/init_commlog.c", + "//base/startup/init/services/param/base/param_base.c", + "//base/startup/init/services/param/base/param_comm.c", + "//base/startup/init/services/param/base/param_trie.c", + "//base/startup/init/services/utils/init_hashmap.c", + "//base/startup/init/services/utils/list.c", ] sysparam_source = [ - "//base/startup/init_lite/interfaces/innerkits/syspara/param_comm.c", - "//base/startup/init_lite/interfaces/innerkits/syspara/parameter.c", - "//base/startup/init_lite/interfaces/innerkits/syspara/sysversion.c", + "//base/startup/init/interfaces/innerkits/syspara/param_comm.c", + "//base/startup/init/interfaces/innerkits/syspara/parameter.c", + "//base/startup/init/interfaces/innerkits/syspara/sysversion.c", ] unittest("init_test") { @@ -79,31 +79,31 @@ if (defined(ohos_lite)) { } include_dirs = [ - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/services/init/include", - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/services/loopevent/include", - "//base/startup/init_lite/services/loopevent/timer", - "//base/startup/init_lite/services/loopevent/task", - "//base/startup/init_lite/services/loopevent/utils", - "//base/startup/init_lite/services/param/adapter", - "//base/startup/init_lite/services/param/base", - "//base/startup/init_lite/services/param/linux", - "//base/startup/init_lite/services/param/include", - "//base/startup/init_lite/services/param/watcher/agent", - "//base/startup/init_lite/services/param/watcher/include", - "//base/startup/init_lite/services/param/watcher/proxy", - "//base/startup/init_lite/test/unittest", - "//base/startup/init_lite/test/unittest/param", - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/interfaces/innerkits/include/syspara", - "//base/startup/init_lite/interfaces/innerkits/syspara", + "//base/startup/init/services/include", + "//base/startup/init/services/include/param", + "//base/startup/init/services/init/include", + "//base/startup/init/services/log", + "//base/startup/init/services/loopevent/include", + "//base/startup/init/services/loopevent/timer", + "//base/startup/init/services/loopevent/task", + "//base/startup/init/services/loopevent/utils", + "//base/startup/init/services/param/adapter", + "//base/startup/init/services/param/base", + "//base/startup/init/services/param/linux", + "//base/startup/init/services/param/include", + "//base/startup/init/services/param/watcher/agent", + "//base/startup/init/services/param/watcher/include", + "//base/startup/init/services/param/watcher/proxy", + "//base/startup/init/test/unittest", + "//base/startup/init/test/unittest/param", + "//base/startup/init/interfaces/innerkits/include", + "//base/startup/init/interfaces/innerkits/include/syspara", + "//base/startup/init/interfaces/innerkits/syspara", "//third_party/cJSON", "//third_party/bounds_checking_function/include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits", - "//base/startup/init_lite/interfaces/innerkits/fd_holder", - "//base/startup/init_lite/interfaces/hals", + "//base/startup/init/interfaces/innerkits/fd_holder", + "//base/startup/init/interfaces/hals", ] sources = sysparam_source @@ -115,16 +115,16 @@ if (defined(ohos_lite)) { defines += [ "__LITEOS_A__" ] include_dirs += [ "//kernel/liteos_a/syscall", - "//base/startup/init_lite/interfaces/kits/syscap", - "//base/startup/init_lite/initsync/include", + "//base/startup/init/interfaces/kits/syscap", + "//base/startup/init/initsync/include", ] sources += init_common_sources sources += [ - "//base/startup/init_lite/services/param/adapter/param_persistadp.c", - "//base/startup/init_lite/services/param/liteos/param_client.c", - "//base/startup/init_lite/services/param/liteos/param_litedac.c", - "//base/startup/init_lite/services/param/liteos/param_osadp.c", - "//base/startup/init_lite/services/param/liteos/param_service.c", + "//base/startup/init/services/param/adapter/param_persistadp.c", + "//base/startup/init/services/param/liteos/param_client.c", + "//base/startup/init/services/param/liteos/param_litedac.c", + "//base/startup/init/services/param/liteos/param_osadp.c", + "//base/startup/init/services/param/liteos/param_service.c", ] sources += [ @@ -139,15 +139,15 @@ if (defined(ohos_lite)) { if (enable_ohos_startup_init_feature_begetctl_liteos) { deps += [ "$ohos_product_adapter_dir/utils/sys_param:hal_sysparam", - "//base/startup/init_lite/services/param/liteos:lite_ohos_param_to", + "//base/startup/init/services/param/liteos:lite_ohos_param_to", ] - include_dirs += [ "$root_out_dir/gen/init_lite" ] + include_dirs += [ "$root_out_dir/gen/init" ] defines += [ "PARAM_LOAD_CFG_FROM_CODE" ] } deps += [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//base/startup/init_lite/initsync:initsync", - "//base/startup/init_lite/services/loopevent:loopevent", + "//base/startup/init/initsync:initsync", + "//base/startup/init/services/loopevent:loopevent", "//build/lite/config/component/cJSON:cjson_static", "//third_party/mbedtls:mbedtls", ] @@ -156,11 +156,11 @@ if (defined(ohos_lite)) { if (ohos_kernel_type == "liteos_m") { defines += [ "__LITEOS_M__" ] sources += [ - "//base/startup/init_lite/services/param/liteos/param_client.c", - "//base/startup/init_lite/services/param/liteos/param_hal.c", - "//base/startup/init_lite/services/param/liteos/param_litedac.c", - "//base/startup/init_lite/services/param/liteos/param_osadp.c", - "//base/startup/init_lite/services/param/liteos/param_service.c", + "//base/startup/init/services/param/liteos/param_client.c", + "//base/startup/init/services/param/liteos/param_hal.c", + "//base/startup/init/services/param/liteos/param_litedac.c", + "//base/startup/init/services/param/liteos/param_osadp.c", + "//base/startup/init/services/param/liteos/param_service.c", ] if (enable_ohos_startup_init_lite_use_posix_file_api) { defines += [ "PARAM_SUPPORT_POSIX" ] @@ -174,10 +174,9 @@ if (defined(ohos_lite)) { # add cfg.h if (enable_ohos_startup_init_feature_begetctl_liteos) { - deps += [ - "//base/startup/init_lite/services/param/liteos:lite_ohos_param_to", - ] - include_dirs += [ "$root_out_dir/gen/init_lite" ] + deps += + [ "//base/startup/init/services/param/liteos:lite_ohos_param_to" ] + include_dirs += [ "$root_out_dir/gen/init" ] defines += [ "PARAM_LOAD_CFG_FROM_CODE" ] } deps += [ @@ -190,16 +189,16 @@ if (defined(ohos_lite)) { sources += init_common_sources sources += [ - "//base/startup/init_lite/services/param/adapter/param_dac.c", - "//base/startup/init_lite/services/param/adapter/param_persistadp.c", - "//base/startup/init_lite/services/param/linux/param_message.c", - "//base/startup/init_lite/services/param/linux/param_msgadp.c", - "//base/startup/init_lite/services/param/linux/param_osadp.c", - "//base/startup/init_lite/services/param/linux/param_request.c", - "//base/startup/init_lite/services/param/linux/param_service.c", - "//base/startup/init_lite/services/param/trigger/trigger_checker.c", - "//base/startup/init_lite/services/param/trigger/trigger_manager.c", - "//base/startup/init_lite/services/param/trigger/trigger_processor.c", + "//base/startup/init/services/param/adapter/param_dac.c", + "//base/startup/init/services/param/adapter/param_persistadp.c", + "//base/startup/init/services/param/linux/param_message.c", + "//base/startup/init/services/param/linux/param_msgadp.c", + "//base/startup/init/services/param/linux/param_osadp.c", + "//base/startup/init/services/param/linux/param_request.c", + "//base/startup/init/services/param/linux/param_service.c", + "//base/startup/init/services/param/trigger/trigger_checker.c", + "//base/startup/init/services/param/trigger/trigger_manager.c", + "//base/startup/init/services/param/trigger/trigger_processor.c", ] sources += [ "../param/client_unittest.cpp", @@ -214,7 +213,7 @@ if (defined(ohos_lite)) { } deps += [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//base/startup/init_lite/services/loopevent:loopevent", + "//base/startup/init/services/loopevent:loopevent", "//build/lite/config/component/cJSON:cjson_static", "//third_party/mbedtls:mbedtls", ] diff --git a/ueventd/BUILD.gn b/ueventd/BUILD.gn index 051a407ef542a5aa614cfc7e309dad3354a18af6..534e7c77623d6175f8d7d7669a62fe6478129961 100644 --- a/ueventd/BUILD.gn +++ b/ueventd/BUILD.gn @@ -14,34 +14,34 @@ if (defined(ohos_lite)) { if (ohos_kernel_type == "linux") { service_ueventd_deps = [ - "//base/startup/init_lite/interfaces/innerkits/socket:libsocket", - "//base/startup/init_lite/services/log:init_log", - "//base/startup/init_lite/services/param/base:parameterbase", - "//base/startup/init_lite/services/utils:libinit_utils", + "//base/startup/init/interfaces/innerkits/socket:libsocket", + "//base/startup/init/services/log:init_log", + "//base/startup/init/services/param/base:parameterbase", + "//base/startup/init/services/utils:libinit_utils", "//third_party/bounds_checking_function:libsec_static", ] executable("ueventd_linux") { sources = [ - "//base/startup/init_lite/services/utils/init_utils.c", - "//base/startup/init_lite/services/utils/list.c", - "//base/startup/init_lite/ueventd/lite/ueventd_parameter.c", - "//base/startup/init_lite/ueventd/ueventd.c", - "//base/startup/init_lite/ueventd/ueventd_device_handler.c", - "//base/startup/init_lite/ueventd/ueventd_firmware_handler.c", - "//base/startup/init_lite/ueventd/ueventd_main.c", - "//base/startup/init_lite/ueventd/ueventd_read_cfg.c", - "//base/startup/init_lite/ueventd/ueventd_socket.c", + "//base/startup/init/services/utils/init_utils.c", + "//base/startup/init/services/utils/list.c", + "//base/startup/init/ueventd/lite/ueventd_parameter.c", + "//base/startup/init/ueventd/ueventd.c", + "//base/startup/init/ueventd/ueventd_device_handler.c", + "//base/startup/init/ueventd/ueventd_firmware_handler.c", + "//base/startup/init/ueventd/ueventd_main.c", + "//base/startup/init/ueventd/ueventd_read_cfg.c", + "//base/startup/init/ueventd/ueventd_socket.c", ] defines = [ "__MUSL__" ] defines += [ "_GNU_SOURCE" ] include_dirs = [ - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/services/utils", - "//base/startup/init_lite/ueventd/include", + "//base/startup/init/services/log", + "//base/startup/init/services/include", + "//base/startup/init/services/include/param", + "//base/startup/init/services/utils", + "//base/startup/init/ueventd/include", ] deps = service_ueventd_deps @@ -55,27 +55,27 @@ if (defined(ohos_lite)) { } else { import("//build/ohos.gni") service_ueventd_sources = [ - "//base/startup/init_lite/services/utils/list.c", - "//base/startup/init_lite/ueventd/ueventd.c", - "//base/startup/init_lite/ueventd/ueventd_device_handler.c", - "//base/startup/init_lite/ueventd/ueventd_firmware_handler.c", - "//base/startup/init_lite/ueventd/ueventd_read_cfg.c", - "//base/startup/init_lite/ueventd/ueventd_socket.c", + "//base/startup/init/services/utils/list.c", + "//base/startup/init/ueventd/ueventd.c", + "//base/startup/init/ueventd/ueventd_device_handler.c", + "//base/startup/init/ueventd/ueventd_firmware_handler.c", + "//base/startup/init/ueventd/ueventd_read_cfg.c", + "//base/startup/init/ueventd/ueventd_socket.c", ] service_ueventd_include = [ "//third_party/bounds_checking_function/include", - "//base/startup/init_lite/services/log", - "//base/startup/init_lite/services/include", - "//base/startup/init_lite/services/utils", - "//base/startup/init_lite/ueventd/include", + "//base/startup/init/services/log", + "//base/startup/init/services/include", + "//base/startup/init/services/utils", + "//base/startup/init/ueventd/include", ] service_ueventd_deps = [ - "//base/startup/init_lite/interfaces/innerkits/socket:libsocket", - "//base/startup/init_lite/services/log:init_log", - "//base/startup/init_lite/services/param/base:parameterbase", - "//base/startup/init_lite/services/utils:libinit_utils", + "//base/startup/init/interfaces/innerkits/socket:libsocket", + "//base/startup/init/services/log:init_log", + "//base/startup/init/services/param/base:parameterbase", + "//base/startup/init/services/utils:libinit_utils", "//third_party/bounds_checking_function:libsec_static", ] @@ -105,16 +105,16 @@ if (defined(ohos_lite)) { ohos_executable("ueventd") { sources = service_ueventd_sources sources += [ - "//base/startup/init_lite/ueventd/standard/ueventd_parameter.c", - "//base/startup/init_lite/ueventd/ueventd_main.c", + "//base/startup/init/ueventd/standard/ueventd_parameter.c", + "//base/startup/init/ueventd/ueventd_main.c", ] include_dirs = service_ueventd_include include_dirs += [ - "//base/startup/init_lite/services/include/param", - "//base/startup/init_lite/interfaces/innerkits/include", + "//base/startup/init/services/include/param", + "//base/startup/init/interfaces/innerkits/include", ] deps = service_ueventd_deps - deps += [ "//base/startup/init_lite/services/param/linux:param_client" ] + deps += [ "//base/startup/init/services/param/linux:param_client" ] cflags = [] if (build_selinux) { @@ -131,7 +131,7 @@ if (defined(ohos_lite)) { } ohos_prebuilt_etc("ueventd.config") { - source = "//base/startup/init_lite/ueventd/etc/ueventd.config" + source = "//base/startup/init/ueventd/etc/ueventd.config" part_name = "init" install_images = [ "system", @@ -152,9 +152,9 @@ group("startup_ueventd") { } } else { deps = [ - "//base/startup/init_lite/ueventd:libueventd_ramdisk_static", - "//base/startup/init_lite/ueventd:ueventd", - "//base/startup/init_lite/ueventd:ueventd.config", + "//base/startup/init/ueventd:libueventd_ramdisk_static", + "//base/startup/init/ueventd:ueventd", + "//base/startup/init/ueventd:ueventd.config", ] } } diff --git a/watchdog/BUILD.gn b/watchdog/BUILD.gn index 4c25e147b8d12d4dadfaeaaa9c1b0c8e31ae7143..2c74ebf18010fa0ba4985a91c66850b1e21a74e2 100644 --- a/watchdog/BUILD.gn +++ b/watchdog/BUILD.gn @@ -14,11 +14,11 @@ if (defined(ohos_lite)) { executable("watchdog_service") { sources = [ - "//base/startup/init_lite/services/log/init_commlog.c", - "//base/startup/init_lite/watchdog/init_watchdog.c", + "//base/startup/init/services/log/init_commlog.c", + "//base/startup/init/watchdog/init_watchdog.c", ] deps = [ - "//base/startup/init_lite/services/log:init_log", + "//base/startup/init/services/log:init_log", "//third_party/bounds_checking_function:libsec_static", ] defines = [ @@ -34,8 +34,8 @@ if (defined(ohos_lite)) { ohos_executable("watchdog_service") { sources = [ "init_watchdog.c" ] deps = [ - "//base/startup/init_lite/services/log:init_log", - "//base/startup/init_lite/services/param/base:parameterbase", + "//base/startup/init/services/log:init_log", + "//base/startup/init/services/param/base:parameterbase", "//third_party/bounds_checking_function:libsec_shared", ] defines = [ "LINUX_WATCHDOG" ]