Skip to content

S
Startup Init Lite

OpenHarmony / Startup Init Lite
大约 1 年 前同步成功

通知 3
Star 37
Fork 0
S
Startup Init Lite

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 c245c837 编写于 作者: O openharmony_ci 提交者： Gitee
浏览文件
操作

!910 init仓名及目录修改 

Merge pull request !910 from Mupceet/init
上级 7fb8488f 866c68f3
隐藏空白更改
内联 并排
Showing with 724 addition and 737 deletion
README.md
浏览文件 @ c245c837
# init\_lite<a name="EN-US_TOPIC_0000001129033057"></a> # init<a name="EN-US_TOPIC_0000001129033057"></a>
- [Introduction](#section469617221261) - [Introduction](#section469617221261)
- [Directory Structure](#section15884114210197) - [Directory Structure](#section15884114210197)
...@@ -8,27 +8,27 @@ ...@@ -8,27 +8,27 @@
## Introduction<a name="section469617221261"></a> ## Introduction<a name="section469617221261"></a>
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<a name="section15884114210197"></a> ## Directory Structure<a name="section15884114210197"></a>
``` ```
base/startup/init_lite/ # init_lite module base/startup/init/ # init module
├── LICENSE ├── LICENSE
└── services └── services
├── include # Header files for the init_lite module ├── include # Header files for the init module
├── src # Source files for the init_lite module ├── src # Source files for the init module
└── test # Source files of the test cases for the init_lite module └── test # Source files of the test cases for the init module
└── unittest └── unittest
vendor vendor
└──huawei └──huawei
└──camera └──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<a name="section12212842173518"></a> ## Constraints<a name="section12212842173518"></a>
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<a name="section837771600"></a> ## Usage<a name="section837771600"></a>
......
README_zh.md
浏览文件 @ c245c837
...@@ -14,7 +14,7 @@ init组件负责处理从内核加载第一个用户态进程开始，到第一 ...@@ -14,7 +14,7 @@ init组件负责处理从内核加载第一个用户态进程开始，到第一
## 目录<a name="section15884114210197"></a> ## 目录<a name="section15884114210197"></a>
``` ```
base/startup/init_lite/ # init组件 base/startup/init/ # init组件
├── device_info ├── device_info
├── initsync ├── initsync
├── interfaces # init提供的对外接口 ├── interfaces # init提供的对外接口
...@@ -84,7 +84,7 @@ init将系统启动分为三个阶段： ...@@ -84,7 +84,7 @@ init将系统启动分为三个阶段：
每个沙盒环境的分为只读资源和可写资源，只读资源由init在初始化时创建好，通过mount bind把只读文件指向全局FS中对应的目录，然后启动相应沙盒进程时通过SetNamespace跳入到沙盒环境运行。对于可写目录，通过对全局/data目录进行划分，由存储服务进行统一管理分配，通过mnt namespace完成可写目录的沙盒化。 每个沙盒环境的分为只读资源和可写资源，只读资源由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以内。
配置文件格式和内容说明如下所示： 配置文件格式和内容说明如下所示：
......
bundle.json
浏览文件 @ c245c837
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"repository": "https://gitee.com/openharmony/startup_init_lite", "repository": "https://gitee.com/openharmony/startup_init_lite",
"publishAs": "code-segment", "publishAs": "code-segment",
"segment": { "segment": {
"destPath": "base/startup/init_lite" "destPath": "base/startup/init"
}, },
"dirs": {}, "dirs": {},
"scripts": {}, "scripts": {},
...@@ -45,21 +45,21 @@ ...@@ -45,21 +45,21 @@
}, },
"build": { "build": {
"sub_component": [ "sub_component": [
"//base/startup/init_lite/services:startup_init", "//base/startup/init/services:startup_init",
"//base/startup/init_lite/ueventd:startup_ueventd", "//base/startup/init/ueventd:startup_ueventd",
"//base/startup/init_lite/watchdog:watchdog", "//base/startup/init/watchdog:watchdog",
"//base/startup/init_lite/services/begetctl:begetctl_cmd", "//base/startup/init/services/begetctl:begetctl_cmd",
"//base/startup/init_lite/services/loopevent:loopeventgroup", "//base/startup/init/services/loopevent:loopeventgroup",
"//base/startup/init_lite/services/modules:modulesgroup", "//base/startup/init/services/modules:modulesgroup",
"//base/startup/init_lite/services/param:parameter", "//base/startup/init/services/param:parameter",
"//base/startup/init_lite/interfaces/innerkits:innergroup", "//base/startup/init/interfaces/innerkits:innergroup",
"//base/startup/init_lite/device_info:device_info_group", "//base/startup/init/device_info:device_info_group",
"//base/startup/init_lite/interfaces/kits:kitsgroup" "//base/startup/init/interfaces/kits:kitsgroup"
], ],
"inner_kits": [ "inner_kits": [
{ {
"header": { "header": {
"header_base": "//base/startup/init_lite/interfaces/innerkits/include/", "header_base": "//base/startup/init/interfaces/innerkits/include/",
"header_files": [ "header_files": [
"init_socket.h", "init_socket.h",
"init_file.h", "init_file.h",
...@@ -75,31 +75,31 @@ ...@@ -75,31 +75,31 @@
"syspara/sysversion.h" "syspara/sysversion.h"
] ]
}, },
"name": "//base/startup/init_lite/interfaces/innerkits:libbegetutil" "name": "//base/startup/init/interfaces/innerkits:libbegetutil"
}, },
{ {
"header": { "header": {
"header_base": "//base/startup/init_lite/interfaces/innerkits/include/", "header_base": "//base/startup/init/interfaces/innerkits/include/",
"header_files": [ "header_files": [
"service_watcher.h", "service_watcher.h",
"syspara/parameter.h", "syspara/parameter.h",
"syspara/sysparam_errno.h" "syspara/sysparam_errno.h"
] ]
}, },
"name": "//base/startup/init_lite/interfaces/innerkits:libbeget_proxy" "name": "//base/startup/init/interfaces/innerkits:libbeget_proxy"
}, },
{ {
"header": { "header": {
"header_base": "//base/startup/init_lite/interfaces/innerkits", "header_base": "//base/startup/init/interfaces/innerkits",
"header_files": [ "header_files": [
"init_module_engine/include/init_module_engine.h" "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": [ "test": [
"//base/startup/init_lite/test:testgroup" "//base/startup/init/test:testgroup"
] ]
} }
} }
......
device_info/BUILD.gn
浏览文件 @ c245c837
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
if (!defined(ohos_lite)) { if (!defined(ohos_lite)) {
import("//build/ohos.gni") import("//build/ohos.gni")
import("//build/ohos/sa_profile/sa_profile.gni") import("//build/ohos/sa_profile/sa_profile.gni")
...@@ -28,17 +28,17 @@ if (!defined(ohos_lite)) { ...@@ -28,17 +28,17 @@ if (!defined(ohos_lite)) {
ohos_shared_library("deviceinfoservice") { ohos_shared_library("deviceinfoservice") {
sources = [ sources = [
"//base/startup/init_lite/interfaces/innerkits/syspara/param_comm.c", "//base/startup/init/interfaces/innerkits/syspara/param_comm.c",
"device_info_stub.cpp", "device_info_stub.cpp",
] ]
include_dirs = [ include_dirs = [
".", ".",
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/innerkits/include/syspara", "//base/startup/init/interfaces/innerkits/include/syspara",
"//base/startup/init_lite/interfaces/innerkits/syspara", "//base/startup/init/interfaces/innerkits/syspara",
"//base/startup/init_lite/interfaces/hals", "//base/startup/init/interfaces/hals",
] ]
defines = [ defines = [
"INIT_AGENT", "INIT_AGENT",
...@@ -46,7 +46,7 @@ if (!defined(ohos_lite)) { ...@@ -46,7 +46,7 @@ if (!defined(ohos_lite)) {
"USE_MBEDTLS", "USE_MBEDTLS",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
"//third_party/mbedtls:mbedtls_shared", "//third_party/mbedtls:mbedtls_shared",
] ]
......
initsync/BUILD.gn
浏览文件 @ c245c837
...@@ -14,19 +14,19 @@ ...@@ -14,19 +14,19 @@
import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/component/lite_component.gni")
lite_component("initsync") { lite_component("initsync") {
features = [ "//base/startup/init_lite/initsync:libinitsync_shared" ] features = [ "//base/startup/init/initsync:libinitsync_shared" ]
} }
shared_library("libinitsync_shared") { shared_library("libinitsync_shared") {
sources = [ "src/init_sync.c" ] sources = [ "src/init_sync.c" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/initsync/include", "//base/startup/init/initsync/include",
"//base/startup/init_lite/interfaces/kits/syscap", "//base/startup/init/interfaces/kits/syscap",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
] ]
public_deps = [ public_deps = [
"//base/startup/init_lite/services/log:init_log", "//base/startup/init/services/log:init_log",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
] ]
} }
...@@ -34,10 +34,10 @@ shared_library("libinitsync_shared") { ...@@ -34,10 +34,10 @@ shared_library("libinitsync_shared") {
static_library("libinitsync_static") { static_library("libinitsync_static") {
sources = [ "src/init_sync.c" ] sources = [ "src/init_sync.c" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/initsync/include", "//base/startup/init/initsync/include",
"//base/startup/init_lite/interfaces/kits/syscap", "//base/startup/init/interfaces/kits/syscap",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
] ]
public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] public_deps = [ "//third_party/bounds_checking_function:libsec_static" ]
} }
interfaces/innerkits/BUILD.gn
浏览文件 @ c245c837
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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) { if (!defined(ohos_lite) || enable_ohos_startup_init_feature_begetctl_liteos) {
syspara_sources = [ syspara_sources = [
"syscap/init_syscap.c", "syscap/init_syscap.c",
...@@ -23,12 +23,12 @@ if (!defined(ohos_lite) || enable_ohos_startup_init_feature_begetctl_liteos) { ...@@ -23,12 +23,12 @@ if (!defined(ohos_lite) || enable_ohos_startup_init_feature_begetctl_liteos) {
config("exported_header_files") { config("exported_header_files") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/innerkits/include/syspara", "//base/startup/init/interfaces/innerkits/include/syspara",
"//base/startup/init_lite/interfaces/innerkits/include/fs_manager", "//base/startup/init/interfaces/innerkits/include/fs_manager",
"//base/startup/init_lite/interfaces/innerkits/include/token", "//base/startup/init/interfaces/innerkits/include/token",
"//base/startup/init_lite/interfaces/innerkits/include/sandbox/include", "//base/startup/init/interfaces/innerkits/include/sandbox/include",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
] ]
} }
...@@ -36,14 +36,14 @@ include_common = [ ...@@ -36,14 +36,14 @@ include_common = [
"./include", "./include",
"//base/hiviewdfx/hilog_lite/interfaces/native/kits", "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/interfaces/innerkits/fd_holder", "//base/startup/init/interfaces/innerkits/fd_holder",
"//base/startup/init_lite/services/param/include", "//base/startup/init/services/param/include",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/innerkits/include/syspara", "//base/startup/init/interfaces/innerkits/include/syspara",
"//base/startup/init_lite/interfaces/hals", "//base/startup/init/interfaces/hals",
"//base/startup/init_lite/interfaces/innerkits/syspara", "//base/startup/init/interfaces/innerkits/syspara",
] ]
if (defined(ohos_lite)) { if (defined(ohos_lite)) {
...@@ -67,8 +67,8 @@ if (defined(ohos_lite)) { ...@@ -67,8 +67,8 @@ if (defined(ohos_lite)) {
"//third_party/mbedtls:mbedtls_shared", "//third_party/mbedtls:mbedtls_shared",
] ]
deps += [ deps += [
"//base/startup/init_lite/services/log:init_log", "//base/startup/init/services/log:init_log",
"//base/startup/init_lite/services/utils:libinit_utils", "//base/startup/init/services/utils:libinit_utils",
] ]
if (enable_ohos_startup_init_feature_begetctl_liteos) { if (enable_ohos_startup_init_feature_begetctl_liteos) {
sources += syspara_sources sources += syspara_sources
...@@ -79,16 +79,15 @@ if (defined(ohos_lite)) { ...@@ -79,16 +79,15 @@ if (defined(ohos_lite)) {
} }
if (ohos_kernel_type == "liteos_a") { if (ohos_kernel_type == "liteos_a") {
defines += [ "__LITEOS_A__" ] defines += [ "__LITEOS_A__" ]
deps += [ deps +=
"//base/startup/init_lite/services/param/liteos:param_client_lite", [ "//base/startup/init/services/param/liteos:param_client_lite" ]
]
} else if (ohos_kernel_type == "linux") { } else if (ohos_kernel_type == "linux") {
sources += [ "socket/init_socket.c" ] sources += [ "socket/init_socket.c" ]
defines += [ "__LINUX__" ] defines += [ "__LINUX__" ]
deps += [ deps += [
"//base/startup/init_lite/services/loopevent:loopevent", "//base/startup/init/services/loopevent:loopevent",
"//base/startup/init_lite/services/param/base:parameterbase", "//base/startup/init/services/param/base:parameterbase",
"//base/startup/init_lite/services/param/linux:param_client", "//base/startup/init/services/param/linux:param_client",
] ]
} }
} }
...@@ -123,9 +122,9 @@ if (defined(ohos_lite)) { ...@@ -123,9 +122,9 @@ if (defined(ohos_lite)) {
} }
if (enable_ohos_startup_init_feature_begetctl_liteos) { if (enable_ohos_startup_init_feature_begetctl_liteos) {
deps += [ deps += [
"//base/startup/init_lite/services/log:init_log", "//base/startup/init/services/log:init_log",
"//base/startup/init_lite/services/param/liteos:param_client_lite", "//base/startup/init/services/param/liteos:param_client_lite",
"//base/startup/init_lite/services/utils:libinit_utils", "//base/startup/init/services/utils:libinit_utils",
] ]
} }
} }
...@@ -140,8 +139,7 @@ if (defined(ohos_lite)) { ...@@ -140,8 +139,7 @@ if (defined(ohos_lite)) {
lib_extension = ".so" lib_extension = ".so"
} }
deps = [ ":libbegetutil" ] deps = [ ":libbegetutil" ]
head_files = head_files = [ "//base/startup/init/interfaces/innerkits/include/syspara" ]
[ "//base/startup/init_lite/interfaces/innerkits/include/syspara" ]
} }
group("libbeget_proxy") { group("libbeget_proxy") {
...@@ -174,17 +172,17 @@ if (defined(ohos_lite)) { ...@@ -174,17 +172,17 @@ if (defined(ohos_lite)) {
include_dirs = include_common include_dirs = include_common
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits/control_fd:libcontrolfd", "//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd",
"//base/startup/init_lite/interfaces/innerkits/fd_holder:fdholder", "//base/startup/init/interfaces/innerkits/fd_holder:fdholder",
"//base/startup/init_lite/interfaces/innerkits/file:libfile", "//base/startup/init/interfaces/innerkits/file:libfile",
"//base/startup/init_lite/interfaces/innerkits/fs_manager:libfsmanager_static", "//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static",
"//base/startup/init_lite/interfaces/innerkits/sandbox:sandbox", "//base/startup/init/interfaces/innerkits/sandbox:sandbox",
"//base/startup/init_lite/interfaces/innerkits/socket:libsocket", "//base/startup/init/interfaces/innerkits/socket:libsocket",
"//base/startup/init_lite/services/log:agent_log", "//base/startup/init/services/log:agent_log",
"//base/startup/init_lite/services/loopevent:loopevent", "//base/startup/init/services/loopevent:loopevent",
"//base/startup/init_lite/services/param/base:parameterbase", "//base/startup/init/services/param/base:parameterbase",
"//base/startup/init_lite/services/param/linux:param_client", "//base/startup/init/services/param/linux:param_client",
"//base/startup/init_lite/services/utils:libinit_utils", "//base/startup/init/services/utils:libinit_utils",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
"//third_party/cJSON:cjson", "//third_party/cJSON:cjson",
"//third_party/mbedtls:mbedtls_shared", "//third_party/mbedtls:mbedtls_shared",
...@@ -209,7 +207,7 @@ if (defined(ohos_lite)) { ...@@ -209,7 +207,7 @@ if (defined(ohos_lite)) {
"USE_MBEDTLS", "USE_MBEDTLS",
] ]
sources = [ sources = [
"//base/startup/init_lite/device_info/device_info.cpp", "//base/startup/init/device_info/device_info.cpp",
"service_watcher/service_watcher.c", "service_watcher/service_watcher.c",
] ]
...@@ -221,14 +219,14 @@ if (defined(ohos_lite)) { ...@@ -221,14 +219,14 @@ if (defined(ohos_lite)) {
if (enable_ohos_startup_init_feature_watcher) { if (enable_ohos_startup_init_feature_watcher) {
sources += [ sources += [
"//base/startup/init_lite/services/param/watcher/agent/watcher.cpp", "//base/startup/init/services/param/watcher/agent/watcher.cpp",
"//base/startup/init_lite/services/param/watcher/agent/watcher_manager_kits.cpp", "//base/startup/init/services/param/watcher/agent/watcher_manager_kits.cpp",
"//base/startup/init_lite/services/param/watcher/agent/watcher_manager_proxy.cpp", "//base/startup/init/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_stub.cpp",
] ]
include_dirs += [ include_dirs += [
"//base/startup/init_lite/services/param/watcher/include", "//base/startup/init/services/param/watcher/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
] ]
} else { } else {
defines += [ "NO_PARAM_WATCHER" ] defines += [ "NO_PARAM_WATCHER" ]
...@@ -236,15 +234,14 @@ if (defined(ohos_lite)) { ...@@ -236,15 +234,14 @@ if (defined(ohos_lite)) {
if (enable_ohos_startup_init_feature_deviceinfo) { if (enable_ohos_startup_init_feature_deviceinfo) {
sources += [ sources += [
"//base/startup/init_lite/device_info/device_info_kits.cpp", "//base/startup/init/device_info/device_info_kits.cpp",
"//base/startup/init_lite/device_info/device_info_load.cpp", "//base/startup/init/device_info/device_info_load.cpp",
"//base/startup/init_lite/device_info/device_info_proxy.cpp", "//base/startup/init/device_info/device_info_proxy.cpp",
] ]
defines += [ "PARAM_FEATURE_DEVICEINFO" ] defines += [ "PARAM_FEATURE_DEVICEINFO" ]
} else { } else {
sources += [ sources +=
"//base/startup/init_lite/interfaces/innerkits/syspara/param_comm.c", [ "//base/startup/init/interfaces/innerkits/syspara/param_comm.c" ]
]
} }
external_deps = [ external_deps = [
...@@ -273,11 +270,11 @@ if (defined(ohos_lite)) { ...@@ -273,11 +270,11 @@ if (defined(ohos_lite)) {
include_dirs = include_common include_dirs = include_common
deps = [ deps = [
"//base/startup/init_lite/services/log:agent_log", "//base/startup/init/services/log:agent_log",
"//base/startup/init_lite/services/loopevent:loopevent", "//base/startup/init/services/loopevent:loopevent",
"//base/startup/init_lite/services/param/base:parameterbase", "//base/startup/init/services/param/base:parameterbase",
"//base/startup/init_lite/services/param/linux:param_client", "//base/startup/init/services/param/linux:param_client",
"//base/startup/init_lite/services/utils:libinit_utils", "//base/startup/init/services/utils:libinit_utils",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
"//third_party/mbedtls:mbedtls_shared", "//third_party/mbedtls:mbedtls_shared",
] ]
......
interfaces/innerkits/control_fd/BUILD.gn
浏览文件 @ c245c837
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
import("//build/ohos.gni") import("//build/ohos.gni")
config("exported_header_files") { config("exported_header_files") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/innerkits/control_fd", "//base/startup/init/interfaces/innerkits/control_fd",
] ]
} }
...@@ -31,8 +31,8 @@ ohos_static_library("libcontrolfd") { ...@@ -31,8 +31,8 @@ ohos_static_library("libcontrolfd") {
include_dirs = [ include_dirs = [
".", ".",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/loopevent/include", "//base/startup/init/services/loopevent/include",
] ]
part_name = "init" part_name = "init"
} }
interfaces/innerkits/fd_holder/BUILD.gn
浏览文件 @ c245c837
...@@ -16,17 +16,17 @@ import("//build/ohos.gni") ...@@ -16,17 +16,17 @@ import("//build/ohos.gni")
config("exported_header_files") { config("exported_header_files") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/innerkits/fd_holder", "//base/startup/init/interfaces/innerkits/fd_holder",
] ]
} }
ohos_static_library("fdholder") { ohos_static_library("fdholder") {
sources = [ "fd_holder_internal.c" ] sources = [ "fd_holder_internal.c" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/loopevent/include", "//base/startup/init/services/loopevent/include",
"//third_party/bounds_checking_function/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" ] public_configs = [ ":exported_header_files" ]
part_name = "init" part_name = "init"
......
interfaces/innerkits/file/BUILD.gn
浏览文件 @ c245c837
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//build/ohos.gni") import("//build/ohos.gni")
config("exported_header_files") { config("exported_header_files") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ "//base/startup/init_lite/interfaces/innerkits/include" ] include_dirs = [ "//base/startup/init/interfaces/innerkits/include" ]
} }
ohos_static_library("libfile") { ohos_static_library("libfile") {
sources = [ "init_file.c" ] sources = [ "init_file.c" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
public_configs = [ ":exported_header_files" ] public_configs = [ ":exported_header_files" ]
......
interfaces/innerkits/fs_manager/BUILD.gn
浏览文件 @ c245c837
...@@ -16,7 +16,7 @@ import("//build/ohos.gni") ...@@ -16,7 +16,7 @@ import("//build/ohos.gni")
config("libfsmanager_exported_configs") { config("libfsmanager_exported_configs") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = include_dirs =
[ "//base/startup/init_lite/interfaces/innerkits/include/fs_manager" ] [ "//base/startup/init/interfaces/innerkits/include/fs_manager" ]
} }
ohos_static_library("libfsmanager_static") { ohos_static_library("libfsmanager_static") {
...@@ -25,11 +25,11 @@ ohos_static_library("libfsmanager_static") { ...@@ -25,11 +25,11 @@ ohos_static_library("libfsmanager_static") {
"fstab_mount.c", "fstab_mount.c",
] ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/param/include", "//base/startup/init/services/param/include",
] ]
public_configs = [ ":libfsmanager_exported_configs" ] public_configs = [ ":libfsmanager_exported_configs" ]
part_name = "init" part_name = "init"
......
interfaces/innerkits/init_module_engine/BUILD.gn
浏览文件 @ c245c837
...@@ -25,9 +25,9 @@ if (defined(ohos_lite)) { ...@@ -25,9 +25,9 @@ if (defined(ohos_lite)) {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"include/", "include/",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//third_party/cJSON", "//third_party/cJSON",
] ]
} }
...@@ -62,10 +62,10 @@ if (defined(ohos_lite)) { ...@@ -62,10 +62,10 @@ if (defined(ohos_lite)) {
config("init_module_engine_sources_config") { config("init_module_engine_sources_config") {
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/init_module_engine/include", "//base/startup/init/interfaces/innerkits/init_module_engine/include",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//third_party/cJSON", "//third_party/cJSON",
] ]
} }
......
interfaces/innerkits/sandbox/BUILD.gn
浏览文件 @ c245c837
...@@ -11,13 +11,12 @@ ...@@ -11,13 +11,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
import("//build/ohos.gni") import("//build/ohos.gni")
config("exported_header_files") { config("exported_header_files") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = include_dirs = [ "//base/startup/init/interfaces/innerkits/sandbox/include" ]
[ "//base/startup/init_lite/interfaces/innerkits/sandbox/include" ]
} }
ohos_static_library("sandbox") { ohos_static_library("sandbox") {
...@@ -28,8 +27,8 @@ ohos_static_library("sandbox") { ...@@ -28,8 +27,8 @@ ohos_static_library("sandbox") {
public_configs = [ ":exported_header_files" ] public_configs = [ ":exported_header_files" ]
include_dirs = [ include_dirs = [
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//third_party/cJSON", "//third_party/cJSON",
] ]
if (target_cpu == "arm64") { if (target_cpu == "arm64") {
......
interfaces/innerkits/socket/BUILD.gn
浏览文件 @ c245c837
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
# limitations under the License. # limitations under the License.
service_socket_sources = 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 = [ service_socket_include = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
......
interfaces/innerkits/syscap/BUILD.gn
浏览文件 @ c245c837
...@@ -22,10 +22,10 @@ ohos_shared_library("syscap") { ...@@ -22,10 +22,10 @@ ohos_shared_library("syscap") {
include_dirs = [ include_dirs = [
"../include", "../include",
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
] ]
......
interfaces/innerkits/token/BUILD.gn
浏览文件 @ c245c837
...@@ -12,17 +12,17 @@ ...@@ -12,17 +12,17 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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/config/component/lite_component.gni")
import("//build/lite/ndk/ndk.gni") import("//build/lite/ndk/ndk.gni")
if (ohos_kernel_type == "liteos_a" || ohos_kernel_type == "linux") { if (ohos_kernel_type == "liteos_a" || ohos_kernel_type == "linux") {
shared_library("token_shared") { shared_library("token_shared") {
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/innerkits/include/token", "//base/startup/init/interfaces/innerkits/include/token",
"//utils/native/lite/include", "//utils/native/lite/include",
"//base/startup/init_lite/interfaces/innerkits/token", "//base/startup/init/interfaces/innerkits/token",
] ]
sources = [ "src/token_impl_posix/token.c" ] sources = [ "src/token_impl_posix/token.c" ]
...@@ -38,10 +38,10 @@ if (ohos_kernel_type == "liteos_m") { ...@@ -38,10 +38,10 @@ if (ohos_kernel_type == "liteos_m") {
sources = [ "src/token_impl_hal/token.c" ] sources = [ "src/token_impl_hal/token.c" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/innerkits/include/token", "//base/startup/init/interfaces/innerkits/include/token",
"//utils/native/lite/include", "//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", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite",
] ]
...@@ -67,8 +67,7 @@ ndk_lib("token_notes") { ...@@ -67,8 +67,7 @@ ndk_lib("token_notes") {
lib_extension = ".so" lib_extension = ".so"
} }
if (ohos_kernel_type != "liteos_m") { if (ohos_kernel_type != "liteos_m") {
deps += deps += [ "//base/startup/init/interfaces/innerkits/token:token_shared" ]
[ "//base/startup/init_lite/interfaces/innerkits/token:token_shared" ]
} }
head_files += [ "//base/startup/init_lite/interfaces/include/token" ] head_files += [ "//base/startup/init/interfaces/include/token" ]
} }
interfaces/kits/BUILD.gn
浏览文件 @ c245c837
...@@ -16,8 +16,8 @@ import("//build/ohos.gni") ...@@ -16,8 +16,8 @@ import("//build/ohos.gni")
group("kitsgroup") { group("kitsgroup") {
if (!defined(ohos_lite)) { if (!defined(ohos_lite)) {
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbeget_proxy", "//base/startup/init/interfaces/innerkits:libbeget_proxy",
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
] ]
deps += [ "syscap:deviceinfo_ndk" ] deps += [ "syscap:deviceinfo_ndk" ]
if (support_jsapi) { if (support_jsapi) {
......
interfaces/kits/jskits/BUILD.gn
浏览文件 @ c245c837
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
import("//build/ohos.gni") import("//build/ohos.gni")
ohos_shared_library("deviceinfo") { 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" ] sources = [ "src/native_deviceinfo_js.cpp" ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbeget_proxy", "//base/startup/init/interfaces/innerkits:libbeget_proxy",
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
] ]
external_deps = [ external_deps = [
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
...@@ -43,8 +43,8 @@ ohos_shared_library("systemparameter") { ...@@ -43,8 +43,8 @@ ohos_shared_library("systemparameter") {
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbeget_proxy", "//base/startup/init/interfaces/innerkits:libbeget_proxy",
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
] ]
external_deps = [ external_deps = [
......
interfaces/kits/syscap/BUILD.gn
浏览文件 @ c245c837
...@@ -16,7 +16,7 @@ import("//build/ohos.gni") ...@@ -16,7 +16,7 @@ import("//build/ohos.gni")
ohos_shared_library("deviceinfo_ndk") { ohos_shared_library("deviceinfo_ndk") {
sources = [ "src/syscap_ndk.c" ] sources = [ "src/syscap_ndk.c" ]
include_dirs = [ "./include" ] include_dirs = [ "./include" ]
deps = [ "//base/startup/init_lite/interfaces/innerkits:libbegetutil" ] deps = [ "//base/startup/init/interfaces/innerkits:libbegetutil" ]
part_name = "init" part_name = "init"
} }
......
services/BUILD.gn
浏览文件 @ c245c837
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
group("startup_init") { group("startup_init") {
deps = [] deps = []
...@@ -23,7 +23,7 @@ group("startup_init") { ...@@ -23,7 +23,7 @@ group("startup_init") {
# for unittest # for unittest
if (ohos_build_type == "debug") { 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") { ...@@ -35,9 +35,9 @@ group("startup_init") {
] ]
if (enable_ohos_startup_init_feature_watcher) { if (enable_ohos_startup_init_feature_watcher) {
deps += [ deps += [
"//base/startup/init_lite/services/param/watcher:param_watcher", "//base/startup/init/services/param/watcher:param_watcher",
"//base/startup/init_lite/services/param/watcher:param_watcher.rc", "//base/startup/init/services/param/watcher:param_watcher.rc",
"//base/startup/init_lite/services/param/watcher/sa_profile:param_watcher_profile", "//base/startup/init/services/param/watcher/sa_profile:param_watcher_profile",
] ]
} }
} }
......
services/begetctl/BUILD.gn
浏览文件 @ c245c837
...@@ -10,21 +10,21 @@ ...@@ -10,21 +10,21 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
common_include_dirs = [ common_include_dirs = [
"//base/startup/init_lite/services/begetctl", "//base/startup/init/services/begetctl",
"//base/startup/init_lite/services/begetctl/shell", "//base/startup/init/services/begetctl/shell",
"//base/startup/init_lite/services/param/include", "//base/startup/init/services/param/include",
"//base/startup/init_lite/services/param/adapter", "//base/startup/init/services/param/adapter",
"//base/startup/init_lite/services/param/linux", "//base/startup/init/services/param/linux",
"//base/startup/init_lite/services/param/base", "//base/startup/init/services/param/base",
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/loopevent/include", "//base/startup/init/services/loopevent/include",
"//base/startup/init_lite/services/init/include", "//base/startup/init/services/init/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
...@@ -42,14 +42,14 @@ if (defined(ohos_lite)) { ...@@ -42,14 +42,14 @@ if (defined(ohos_lite)) {
"OHOS_LITE", "OHOS_LITE",
] ]
if (param_test) { 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 include_dirs = common_include_dirs
deps = [ deps = [
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//base/startup/init_lite/services/utils:libinit_utils", "//base/startup/init/services/utils:libinit_utils",
"//build/lite/config/component/cJSON:cjson_static", "//build/lite/config/component/cJSON:cjson_static",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
...@@ -79,23 +79,23 @@ if (defined(ohos_lite)) { ...@@ -79,23 +79,23 @@ if (defined(ohos_lite)) {
include_dirs = [ include_dirs = [
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//base/startup/init_lite/interfaces/innerkits/sandbox/include", "//base/startup/init/interfaces/innerkits/sandbox/include",
"//base/startup/init_lite/interfaces/innerkits/control_fd", "//base/startup/init/interfaces/innerkits/control_fd",
] ]
include_dirs += common_include_dirs include_dirs += common_include_dirs
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//base/startup/init_lite/interfaces/innerkits/control_fd:libcontrolfd", "//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
] ]
external_deps = [ "utils_base:utils" ] external_deps = [ "utils_base:utils" ]
if (param_test) { if (param_test) {
sources += [ sources += [
"//base/startup/init_lite/test/moduletest/param_test_cmds.c", "//base/startup/init/test/moduletest/param_test_cmds.c",
"//base/startup/init_lite/test/moduletest/syspara.cpp", "//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 += [ defines += [
"OHOS_SERVICE_DUMP", "OHOS_SERVICE_DUMP",
"INIT_TEST", "INIT_TEST",
...@@ -139,7 +139,7 @@ if (defined(ohos_lite)) { ...@@ -139,7 +139,7 @@ if (defined(ohos_lite)) {
defines = [ "_GNU_SOURCE" ] defines = [ "_GNU_SOURCE" ]
include_dirs = common_include_dirs include_dirs = common_include_dirs
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
...@@ -151,10 +151,10 @@ if (defined(ohos_lite)) { ...@@ -151,10 +151,10 @@ if (defined(ohos_lite)) {
if (param_test) { if (param_test) {
sources += [ sources += [
"//base/startup/init_lite/test/moduletest/param_test_cmds.c", "//base/startup/init/test/moduletest/param_test_cmds.c",
"//base/startup/init_lite/test/moduletest/syspara.cpp", "//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 += [ defines += [
"OHOS_SERVICE_DUMP", "OHOS_SERVICE_DUMP",
"INIT_TEST", "INIT_TEST",
...@@ -181,11 +181,11 @@ if (defined(ohos_lite)) { ...@@ -181,11 +181,11 @@ if (defined(ohos_lite)) {
include_dirs = common_include_dirs include_dirs = common_include_dirs
deps = [ deps = [
"//base/startup/init_lite/services/log:agent_log", "//base/startup/init/services/log:agent_log",
"//base/startup/init_lite/services/loopevent:loopevent", "//base/startup/init/services/loopevent:loopevent",
"//base/startup/init_lite/services/param/base:parameterbase", "//base/startup/init/services/param/base:parameterbase",
"//base/startup/init_lite/services/param/linux:param_client", "//base/startup/init/services/param/linux:param_client",
"//base/startup/init_lite/services/utils:libinit_utils", "//base/startup/init/services/utils:libinit_utils",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
......
services/etc/BUILD.gn
浏览文件 @ c245c837
...@@ -13,27 +13,26 @@ ...@@ -13,27 +13,26 @@
if (defined(ohos_lite)) { if (defined(ohos_lite)) {
copy("ohos.para") { 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" ] outputs = [ "$root_out_dir/system/etc/param/ohos.para" ]
} }
copy("ohos.para.dac") { 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" ] outputs = [ "$root_out_dir/system/etc/param/ohos.para.dac" ]
} }
copy("ohos.const") { copy("ohos.const") {
sources = [ sources =
"//base/startup/init_lite/services/etc_lite/param/ohos_const/ohos.para", [ "//base/startup/init/services/etc_lite/param/ohos_const/ohos.para" ]
]
outputs = [ "$root_out_dir/system/etc/param/ohos_const/ohos.para" ] outputs = [ "$root_out_dir/system/etc/param/ohos_const/ohos.para" ]
} }
copy("ohos.passwd") { 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" ] outputs = [ "$root_out_dir/etc/passwd" ]
} }
copy("ohos.group") { 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" ] outputs = [ "$root_out_dir/etc/group" ]
} }
...@@ -51,46 +50,45 @@ if (defined(ohos_lite)) { ...@@ -51,46 +50,45 @@ if (defined(ohos_lite)) {
} }
} }
} else { } 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") import("//build/ohos.gni")
# init etc files group # init etc files group
ohos_prebuilt_etc("init.cfg") { ohos_prebuilt_etc("init.cfg") {
if (!enable_ramdisk) { if (!enable_ramdisk) {
source = source = "//base/startup/init/services/etc/init.without_two_stages.cfg"
"//base/startup/init_lite/services/etc/init.without_two_stages.cfg"
} else { } else {
source = "//base/startup/init_lite/services/etc/init.cfg" source = "//base/startup/init/services/etc/init.cfg"
} }
part_name = "init" part_name = "init"
} }
ohos_prebuilt_etc("misc.cfg") { 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" relative_install_dir = "init"
part_name = "init" part_name = "init"
} }
ohos_prebuilt_etc("watchdog.cfg") { 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" relative_install_dir = "init"
part_name = "init" part_name = "init"
} }
ohos_prebuilt_etc("console.cfg") { 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" relative_install_dir = "init"
part_name = "init" part_name = "init"
} }
ohos_prebuilt_etc("ueventd.cfg") { 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" relative_install_dir = "init"
part_name = "init" part_name = "init"
} }
ohos_prebuilt_etc("passwd") { ohos_prebuilt_etc("passwd") {
source = "//base/startup/init_lite/services/etc/passwd" source = "//base/startup/init/services/etc/passwd"
install_images = [ install_images = [
"system", "system",
"updater", "updater",
...@@ -99,7 +97,7 @@ if (defined(ohos_lite)) { ...@@ -99,7 +97,7 @@ if (defined(ohos_lite)) {
} }
ohos_prebuilt_etc("group") { ohos_prebuilt_etc("group") {
source = "//base/startup/init_lite/services/etc/group" source = "//base/startup/init/services/etc/group"
install_images = [ install_images = [
"system", "system",
"updater", "updater",
...@@ -108,17 +106,17 @@ if (defined(ohos_lite)) { ...@@ -108,17 +106,17 @@ if (defined(ohos_lite)) {
} }
ohos_prebuilt_etc("init.usb.cfg") { 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" part_name = "init"
} }
ohos_prebuilt_etc("init.usb.configfs.cfg") { 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" part_name = "init"
} }
ohos_prebuilt_para("ohos.para") { 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 = [ install_images = [
"system", "system",
"updater", "updater",
...@@ -131,7 +129,7 @@ if (defined(ohos_lite)) { ...@@ -131,7 +129,7 @@ if (defined(ohos_lite)) {
} }
ohos_prebuilt_para("ohos.para.dac") { 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 = [ install_images = [
"system", "system",
"updater", "updater",
...@@ -141,18 +139,18 @@ if (defined(ohos_lite)) { ...@@ -141,18 +139,18 @@ if (defined(ohos_lite)) {
} }
ohos_prebuilt_para("ohos_const.para") { 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" part_name = "init"
module_install_dir = "etc/param/ohos_const" module_install_dir = "etc/param/ohos_const"
} }
ohos_prebuilt_etc("boot.group") { 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" part_name = "init"
} }
ohos_prebuilt_etc("charge.group") { 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" part_name = "init"
} }
...@@ -174,9 +172,10 @@ if (defined(ohos_lite)) { ...@@ -174,9 +172,10 @@ if (defined(ohos_lite)) {
ohos_prebuilt_etc("system-sandbox.json") { ohos_prebuilt_etc("system-sandbox.json") {
if (target_cpu == "arm64") { 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 { } 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" part_name = "init"
module_install_dir = "etc/sandbox" module_install_dir = "etc/sandbox"
...@@ -184,16 +183,16 @@ if (defined(ohos_lite)) { ...@@ -184,16 +183,16 @@ if (defined(ohos_lite)) {
ohos_prebuilt_etc("chipset-sandbox.json") { ohos_prebuilt_etc("chipset-sandbox.json") {
if (target_cpu == "arm64") { 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 { } 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" part_name = "init"
module_install_dir = "etc/sandbox" module_install_dir = "etc/sandbox"
} }
ohos_prebuilt_etc("init.reboot") { 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" part_name = "init"
module_install_dir = "etc/init" module_install_dir = "etc/init"
} }
......
services/etc/param/param_fixer.gni
浏览文件 @ c245c837
...@@ -24,7 +24,7 @@ template("ohos_prebuilt_para") { ...@@ -24,7 +24,7 @@ template("ohos_prebuilt_para") {
_output_para_file = get_path_info(invoker.source, "file") _output_para_file = get_path_info(invoker.source, "file")
action_with_pydeps(_fixed_param_target) { action_with_pydeps(_fixed_param_target) {
deps = [] 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" depfile = "${target_gen_dir}/${target_name}.d"
args = [ args = [
"--output", "--output",
......
services/init/lite/BUILD.gn
浏览文件 @ c245c837
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
init_common_sources = [ init_common_sources = [
"../init_capability.c", "../init_capability.c",
...@@ -47,9 +47,9 @@ executable("init") { ...@@ -47,9 +47,9 @@ executable("init") {
sources += init_common_sources sources += init_common_sources
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/innerkits/fd_holder", "//base/startup/init/interfaces/innerkits/fd_holder",
"//base/startup/init_lite/services/init/include", "//base/startup/init/services/init/include",
"//third_party/cJSON", "//third_party/cJSON",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//base/hiviewdfx/hilog_lite/interfaces/native/kits", "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
...@@ -58,10 +58,10 @@ executable("init") { ...@@ -58,10 +58,10 @@ executable("init") {
ldflags = [] ldflags = []
deps = [ deps = [
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
"//base/startup/init_lite/services/log:init_log", "//base/startup/init/services/log:init_log",
"//base/startup/init_lite/services/loopevent:loopevent", "//base/startup/init/services/loopevent:loopevent",
"//base/startup/init_lite/services/param/base:parameterbase", "//base/startup/init/services/param/base:parameterbase",
"//base/startup/init_lite/services/utils:libinit_utils", "//base/startup/init/services/utils:libinit_utils",
"//build/lite/config/component/cJSON:cjson_static", "//build/lite/config/component/cJSON:cjson_static",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
...@@ -71,12 +71,12 @@ executable("init") { ...@@ -71,12 +71,12 @@ executable("init") {
include_dirs += [ include_dirs += [
"//kernel/liteos_a/syscall", "//kernel/liteos_a/syscall",
"//kernel/liteos_a/kernel/include", "//kernel/liteos_a/kernel/include",
"//base/startup/init_lite/interfaces/kits/syscap", "//base/startup/init/interfaces/kits/syscap",
"//base/startup/init_lite/initsync/include", "//base/startup/init/initsync/include",
] ]
deps += [ deps += [
"//base/startup/init_lite/initsync:initsync", "//base/startup/init/initsync:initsync",
"//base/startup/init_lite/services/param/liteos:param_init_lite", "//base/startup/init/services/param/liteos:param_init_lite",
] ]
} }
if (ohos_kernel_type == "linux") { if (ohos_kernel_type == "linux") {
...@@ -89,7 +89,7 @@ executable("init") { ...@@ -89,7 +89,7 @@ executable("init") {
"-lpthread", "-lpthread",
] ]
deps += [ deps += [
"//base/startup/init_lite/services/param/linux:param_init", "//base/startup/init/services/param/linux:param_init",
"//third_party/mksh", "//third_party/mksh",
"//third_party/toybox", "//third_party/toybox",
] ]
......
services/init/lite/bundle.json
浏览文件 @ c245c837
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"repository": "https://gitee.com/openharmony/startup_init_lite", "repository": "https://gitee.com/openharmony/startup_init_lite",
"publishAs": "code-segment", "publishAs": "code-segment",
"segment": { "segment": {
"destPath": "base/startup/init_lite" "destPath": "base/startup/init"
}, },
"dirs": {}, "dirs": {},
"scripts": {}, "scripts": {},
...@@ -29,18 +29,18 @@ ...@@ -29,18 +29,18 @@
}, },
"build": { "build": {
"sub_component": [ "sub_component": [
"//base/startup/init_lite/services:startup_init", "//base/startup/init/services:startup_init",
"//base/startup/init_lite/ueventd:startup_ueventd", "//base/startup/init/ueventd:startup_ueventd",
"//base/startup/init_lite/watchdog:watchdog", "//base/startup/init/watchdog:watchdog",
"//base/startup/init_lite/services/begetctl:begetctl_cmd", "//base/startup/init/services/begetctl:begetctl_cmd",
"//base/startup/init_lite/services/loopevent:loopeventgroup", "//base/startup/init/services/loopevent:loopeventgroup",
"//base/startup/init_lite/services/modules:modulesgroup", "//base/startup/init/services/modules:modulesgroup",
"//base/startup/init_lite/services/param:parameter" "//base/startup/init/services/param:parameter"
], ],
"inner_kits": [ "inner_kits": [
{ {
"header": { "header": {
"header_base": "//base/startup/init_lite/interfaces/innerkits/include/", "header_base": "//base/startup/init/interfaces/innerkits/include/",
"header_files": [ "header_files": [
"beget_ext.h", "beget_ext.h",
"syspara/parameter.h", "syspara/parameter.h",
...@@ -50,11 +50,11 @@ ...@@ -50,11 +50,11 @@
"syspara/sysversion.h" "syspara/sysversion.h"
] ]
}, },
"name": "//base/startup/init_lite/interfaces/innerkits:libbegetutil" "name": "//base/startup/init/interfaces/innerkits:libbegetutil"
} }
], ],
"test": [ "test": [
"//base/startup/init_lite/test:testgroup" "//base/startup/init/test:testgroup"
] ]
} }
} }
......
services/init/standard/BUILD.gn
浏览文件 @ c245c837
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
init_common_sources = [ init_common_sources = [
"../init_capability.c", "../init_capability.c",
...@@ -45,37 +45,37 @@ ohos_executable("init") { ...@@ -45,37 +45,37 @@ ohos_executable("init") {
] ]
modulemgr_sources = [ modulemgr_sources = [
"//base/startup/init_lite/interfaces/innerkits/hookmgr/hookmgr.c", "//base/startup/init/interfaces/innerkits/hookmgr/hookmgr.c",
"//base/startup/init_lite/interfaces/innerkits/modulemgr/modulemgr.c", "//base/startup/init/interfaces/innerkits/modulemgr/modulemgr.c",
] ]
sources += modulemgr_sources sources += modulemgr_sources
sources += init_common_sources sources += init_common_sources
include_dirs = [ "//base/startup/init_lite/services/init/include" ] include_dirs = [ "//base/startup/init/services/init/include" ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits/control_fd:libcontrolfd", "//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd",
"//base/startup/init_lite/interfaces/innerkits/fd_holder:fdholder", "//base/startup/init/interfaces/innerkits/fd_holder:fdholder",
"//base/startup/init_lite/interfaces/innerkits/fs_manager:libfsmanager_static", "//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static",
"//base/startup/init_lite/interfaces/innerkits/sandbox:sandbox", "//base/startup/init/interfaces/innerkits/sandbox:sandbox",
"//base/startup/init_lite/services/loopevent:loopevent", "//base/startup/init/services/loopevent:loopevent",
"//base/startup/init_lite/services/param/base:parameterbase", "//base/startup/init/services/param/base:parameterbase",
"//base/startup/init_lite/services/param/linux:param_init", "//base/startup/init/services/param/linux:param_init",
"//base/startup/init_lite/services/utils:libinit_utils", "//base/startup/init/services/utils:libinit_utils",
] ]
deps += [ deps += [
"//base/customization/config_policy/frameworks/config_policy:configpolicy_util_for_init_static", "//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/nativetoken:libnativetoken",
"//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", "//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/bounds_checking_function:libsec_static",
"//third_party/cJSON:cjson_static", "//third_party/cJSON:cjson_static",
] ]
deps += [ "//base/startup/init_lite/interfaces/innerkits/init_module_engine:libinit_stub_versionscript" ] deps += [ "//base/startup/init/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/interfaces/innerkits/init_module_engine:init_module_engine_sources" ]
deps += [ "//base/startup/init_lite/services/modules:static_modules" ] deps += [ "//base/startup/init/services/modules:static_modules" ]
cflags = [] cflags = []
...@@ -125,9 +125,9 @@ ohos_executable("init") { ...@@ -125,9 +125,9 @@ ohos_executable("init") {
defines += [ "PRODUCT_RK" ] defines += [ "PRODUCT_RK" ]
} }
version_script = get_label_info( 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( "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 "name") + stub_version_script_suffix
defines += [ "_GNU_SOURCE" ] defines += [ "_GNU_SOURCE" ]
install_images = [ install_images = [
......
services/log/BUILD.gn
浏览文件 @ c245c837
...@@ -15,8 +15,8 @@ base_sources = [ "init_log.c" ] ...@@ -15,8 +15,8 @@ base_sources = [ "init_log.c" ]
config("exported_header_files") { config("exported_header_files") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
] ]
} }
......
services/loopevent/BUILD.gn
浏览文件 @ c245c837
...@@ -25,9 +25,9 @@ common_sources = [ ...@@ -25,9 +25,9 @@ common_sources = [
] ]
common_include = [ common_include = [
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"include", "include",
"loop", "loop",
...@@ -40,7 +40,7 @@ common_include = [ ...@@ -40,7 +40,7 @@ common_include = [
config("exported_header_files") { config("exported_header_files") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ "//base/startup/init_lite/services/loopevent/include" ] include_dirs = [ "//base/startup/init/services/loopevent/include" ]
} }
if (defined(ohos_lite)) { if (defined(ohos_lite)) {
......
services/modules/BUILD.gn
浏览文件 @ c245c837
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# limitations under the License. # limitations under the License.
if (!defined(ohos_lite)) { if (!defined(ohos_lite)) {
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
import("//build/ohos.gni") import("//build/ohos.gni")
ohos_shared_library("bootchart") { ohos_shared_library("bootchart") {
...@@ -20,11 +20,11 @@ if (!defined(ohos_lite)) { ...@@ -20,11 +20,11 @@ if (!defined(ohos_lite)) {
include_dirs = [ include_dirs = [
".", ".",
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
"//third_party/cJSON:cjson_static", "//third_party/cJSON:cjson_static",
] ]
...@@ -46,7 +46,7 @@ if (!defined(ohos_lite)) { ...@@ -46,7 +46,7 @@ if (!defined(ohos_lite)) {
ohos_source_set("libbootchart_static") { ohos_source_set("libbootchart_static") {
sources = [ "bootchart/bootchart_static.c" ] sources = [ "bootchart/bootchart_static.c" ]
public_configs = [ ":libbootchart_static_config" ] 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" ]
} }
} }
......
services/modules/bootevent/BUILD.gn
浏览文件 @ c245c837
...@@ -15,15 +15,15 @@ import("//build/ohos.gni") ...@@ -15,15 +15,15 @@ import("//build/ohos.gni")
config("bootevent_static_config") { config("bootevent_static_config") {
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/param/linux", "//base/startup/init/services/param/linux",
"//base/startup/init_lite/services/loopevent/include", "//base/startup/init/services/loopevent/include",
"//base/startup/init_lite/services/param/include", "//base/startup/init/services/param/include",
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
] ]
} }
ohos_source_set("libbootevent_static") { ohos_source_set("libbootevent_static") {
sources = [ "bootevent.c" ] sources = [ "bootevent.c" ]
public_configs = [ ":bootevent_static_config" ] 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" ]
} }
services/param/BUILD.gn
浏览文件 @ c245c837
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
group("parameter") { group("parameter") {
deps = [] deps = []
......
services/param/base/BUILD.gn
浏览文件 @ c245c837
...@@ -10,34 +10,34 @@ ...@@ -10,34 +10,34 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
import("//build/ohos.gni") import("//build/ohos.gni")
config("exported_header_files") { config("exported_header_files") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/loopevent/include", "//base/startup/init/services/loopevent/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
] ]
} }
base_sources = [ base_sources = [
"//base/startup/init_lite/services/log/init_commlog.c", "//base/startup/init/services/log/init_commlog.c",
"//base/startup/init_lite/services/param/base/param_base.c", "//base/startup/init/services/param/base/param_base.c",
"//base/startup/init_lite/services/param/base/param_comm.c", "//base/startup/init/services/param/base/param_comm.c",
"//base/startup/init_lite/services/param/base/param_trie.c", "//base/startup/init/services/param/base/param_trie.c",
"//base/startup/init_lite/services/utils/init_hashmap.c", "//base/startup/init/services/utils/init_hashmap.c",
"//base/startup/init_lite/services/utils/list.c", "//base/startup/init/services/utils/list.c",
] ]
base_include_dirs = [ base_include_dirs = [
"//base/startup/init_lite/services/param/include", "//base/startup/init/services/param/include",
"//base/startup/init_lite/services/param/adapter", "//base/startup/init/services/param/adapter",
"//base/startup/init_lite/services/param/linux", "//base/startup/init/services/param/linux",
"//base/startup/init_lite/services/param/base", "//base/startup/init/services/param/base",
"//base/security/selinux/interfaces/policycoreutils/include", "//base/security/selinux/interfaces/policycoreutils/include",
] ]
...@@ -51,8 +51,8 @@ if (defined(ohos_lite)) { ...@@ -51,8 +51,8 @@ if (defined(ohos_lite)) {
if (ohos_kernel_type == "linux") { if (ohos_kernel_type == "linux") {
sources += [ sources += [
"//base/startup/init_lite/services/param/adapter/param_dac.c", "//base/startup/init/services/param/adapter/param_dac.c",
"//base/startup/init_lite/services/param/linux/param_osadp.c", "//base/startup/init/services/param/linux/param_osadp.c",
] ]
defines += [ defines += [
"__LINUX__", "__LINUX__",
...@@ -60,8 +60,8 @@ if (defined(ohos_lite)) { ...@@ -60,8 +60,8 @@ if (defined(ohos_lite)) {
] ]
} else if (ohos_kernel_type == "liteos_a") { } else if (ohos_kernel_type == "liteos_a") {
sources += [ sources += [
"//base/startup/init_lite/services/param/liteos/param_litedac.c", "//base/startup/init/services/param/liteos/param_litedac.c",
"//base/startup/init_lite/services/param/liteos/param_osadp.c", "//base/startup/init/services/param/liteos/param_osadp.c",
] ]
include_dirs += [ "//third_party/bounds_checking_function/include" ] include_dirs += [ "//third_party/bounds_checking_function/include" ]
defines += [ defines += [
...@@ -76,8 +76,8 @@ if (defined(ohos_lite)) { ...@@ -76,8 +76,8 @@ if (defined(ohos_lite)) {
ohos_static_library("parameterbase") { ohos_static_library("parameterbase") {
sources = base_sources sources = base_sources
sources += [ sources += [
"//base/startup/init_lite/services/param/adapter/param_dac.c", "//base/startup/init/services/param/adapter/param_dac.c",
"//base/startup/init_lite/services/param/linux/param_osadp.c", "//base/startup/init/services/param/linux/param_osadp.c",
] ]
cflags = [ "-fPIC" ] cflags = [ "-fPIC" ]
include_dirs = base_include_dirs include_dirs = base_include_dirs
...@@ -95,7 +95,7 @@ if (defined(ohos_lite)) { ...@@ -95,7 +95,7 @@ if (defined(ohos_lite)) {
"//base/security/selinux/interfaces/policycoreutils/include/", "//base/security/selinux/interfaces/policycoreutils/include/",
] ]
sources += sources +=
[ "//base/startup/init_lite/services/param/adapter/param_selinux.c" ] [ "//base/startup/init/services/param/adapter/param_selinux.c" ]
defines += [ defines += [
"PARAM_SUPPORT_SELINUX", "PARAM_SUPPORT_SELINUX",
"PARAMWORKSPACE_NEED_MUTEX", "PARAMWORKSPACE_NEED_MUTEX",
......
services/param/linux/BUILD.gn
浏览文件 @ c245c837
...@@ -10,29 +10,29 @@ ...@@ -10,29 +10,29 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
import("//build/ohos.gni") import("//build/ohos.gni")
config("exported_header_files") { config("exported_header_files") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/service/include/param", "//base/startup/init/interfaces/service/include/param",
"//base/startup/init_lite/interfaces/service/param/include", "//base/startup/init/interfaces/service/param/include",
] ]
} }
param_include_dirs = [ param_include_dirs = [
"//base/startup/init_lite/services/param/include", "//base/startup/init/services/param/include",
"//base/startup/init_lite/services/param/adapter", "//base/startup/init/services/param/adapter",
"//base/startup/init_lite/services/param/linux", "//base/startup/init/services/param/linux",
"//base/startup/init_lite/services/param/base", "//base/startup/init/services/param/base",
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/init/include", "//base/startup/init/services/init/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/interfaces/innerkits/init_module_engine/include", "//base/startup/init/interfaces/innerkits/init_module_engine/include",
"//base/startup/init_lite/services/loopevent/include", "//base/startup/init/services/loopevent/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//third_party/cJSON", "//third_party/cJSON",
"//utils/native/lite/include", "//utils/native/lite/include",
...@@ -40,25 +40,25 @@ param_include_dirs = [ ...@@ -40,25 +40,25 @@ param_include_dirs = [
] ]
param_service_sources = [ param_service_sources = [
"//base/startup/init_lite/services/param/adapter/param_persistadp.c", "//base/startup/init/services/param/adapter/param_persistadp.c",
"//base/startup/init_lite/services/param/linux/param_message.c", "//base/startup/init/services/param/linux/param_message.c",
"//base/startup/init_lite/services/param/linux/param_msgadp.c", "//base/startup/init/services/param/linux/param_msgadp.c",
"//base/startup/init_lite/services/param/linux/param_service.c", "//base/startup/init/services/param/linux/param_service.c",
"//base/startup/init_lite/services/param/manager/param_manager.c", "//base/startup/init/services/param/manager/param_manager.c",
"//base/startup/init_lite/services/param/manager/param_persist.c", "//base/startup/init/services/param/manager/param_persist.c",
"//base/startup/init_lite/services/param/manager/param_server.c", "//base/startup/init/services/param/manager/param_server.c",
] ]
param_trigger_sources = [ param_trigger_sources = [
"//base/startup/init_lite/services/param/trigger/trigger_checker.c", "//base/startup/init/services/param/trigger/trigger_checker.c",
"//base/startup/init_lite/services/param/trigger/trigger_manager.c", "//base/startup/init/services/param/trigger/trigger_manager.c",
"//base/startup/init_lite/services/param/trigger/trigger_processor.c", "//base/startup/init/services/param/trigger/trigger_processor.c",
] ]
param_client_sources = [ param_client_sources = [
"//base/startup/init_lite/services/param/linux/param_message.c", "//base/startup/init/services/param/linux/param_message.c",
"//base/startup/init_lite/services/param/linux/param_request.c", "//base/startup/init/services/param/linux/param_request.c",
"//base/startup/init_lite/services/param/manager/param_manager.c", "//base/startup/init/services/param/manager/param_manager.c",
] ]
# only for linux # only for linux
......
services/param/liteos/BUILD.gn
浏览文件 @ c245c837
...@@ -10,17 +10,17 @@ ...@@ -10,17 +10,17 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
param_include_dirs = [ param_include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include/syspara", "//base/startup/init/interfaces/innerkits/include/syspara",
"//base/startup/init_lite/services/param/include", "//base/startup/init/services/param/include",
"//base/startup/init_lite/services/param/adapter", "//base/startup/init/services/param/adapter",
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/init/include", "//base/startup/init/services/init/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/services/loopevent/include", "//base/startup/init/services/loopevent/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//third_party/cJSON", "//third_party/cJSON",
"//utils/native/lite/include", "//utils/native/lite/include",
...@@ -37,17 +37,17 @@ param_build_defines = [ ...@@ -37,17 +37,17 @@ param_build_defines = [
] ]
action("lite_ohos_param_to") { 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 = [ args = [
"--source", "--source",
rebase_path( 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", "--source",
rebase_path("$ohos_product_adapter_dir/utils/sys_param/vendor.para"), rebase_path("$ohos_product_adapter_dir/utils/sys_param/vendor.para"),
"--source", "--source",
rebase_path("//base/startup/init_lite/services/etc/param/ohos.para"), rebase_path("//base/startup/init/services/etc/param/ohos.para"),
"--dest_dir", "--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" ] outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ]
} }
...@@ -55,32 +55,32 @@ action("lite_ohos_param_to") { ...@@ -55,32 +55,32 @@ action("lite_ohos_param_to") {
config("exported_header_files") { config("exported_header_files") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/service/include/param", "//base/startup/init/interfaces/service/include/param",
"//base/startup/init_lite/interfaces/service/param/include", "//base/startup/init/interfaces/service/param/include",
] ]
} }
base_sources = [ base_sources = [
"//base/startup/init_lite/services/log/init_commlog.c", "//base/startup/init/services/log/init_commlog.c",
"//base/startup/init_lite/services/param/base/param_base.c", "//base/startup/init/services/param/base/param_base.c",
"//base/startup/init_lite/services/param/base/param_comm.c", "//base/startup/init/services/param/base/param_comm.c",
"//base/startup/init_lite/services/param/base/param_trie.c", "//base/startup/init/services/param/base/param_trie.c",
"//base/startup/init_lite/services/param/liteos/param_client.c", "//base/startup/init/services/param/liteos/param_client.c",
"//base/startup/init_lite/services/param/liteos/param_litedac.c", "//base/startup/init/services/param/liteos/param_litedac.c",
"//base/startup/init_lite/services/param/liteos/param_osadp.c", "//base/startup/init/services/param/liteos/param_osadp.c",
"//base/startup/init_lite/services/param/manager/param_manager.c", "//base/startup/init/services/param/manager/param_manager.c",
"//base/startup/init_lite/services/param/manager/param_persist.c", "//base/startup/init/services/param/manager/param_persist.c",
"//base/startup/init_lite/services/utils/init_hashmap.c", "//base/startup/init/services/utils/init_hashmap.c",
"//base/startup/init_lite/services/utils/list.c", "//base/startup/init/services/utils/list.c",
] ]
static_library("param_init_lite") { static_library("param_init_lite") {
defines = [] defines = []
deps = [] deps = []
sources = [ sources = [
"//base/startup/init_lite/services/param/manager/param_manager.c", "//base/startup/init/services/param/manager/param_manager.c",
"//base/startup/init_lite/services/param/manager/param_server.c", "//base/startup/init/services/param/manager/param_server.c",
] ]
include_dirs = param_include_dirs include_dirs = param_include_dirs
defines += param_build_defines defines += param_build_defines
...@@ -88,9 +88,9 @@ static_library("param_init_lite") { ...@@ -88,9 +88,9 @@ static_library("param_init_lite") {
if (ohos_kernel_type == "liteos_a") { if (ohos_kernel_type == "liteos_a") {
sources += [ sources += [
"//base/startup/init_lite/services/param/adapter/param_persistadp.c", "//base/startup/init/services/param/adapter/param_persistadp.c",
"//base/startup/init_lite/services/param/liteos/param_service.c", "//base/startup/init/services/param/liteos/param_service.c",
"//base/startup/init_lite/services/param/manager/param_persist.c", "//base/startup/init/services/param/manager/param_persist.c",
] ]
defines += [ defines += [
"WORKSPACE_AREA_NEED_MUTEX", "WORKSPACE_AREA_NEED_MUTEX",
...@@ -111,7 +111,7 @@ static_library("param_client_lite") { ...@@ -111,7 +111,7 @@ static_library("param_client_lite") {
if (ohos_kernel_type == "liteos_a") { if (ohos_kernel_type == "liteos_a") {
sources += sources +=
[ "//base/startup/init_lite/services/param/adapter/param_persistadp.c" ] [ "//base/startup/init/services/param/adapter/param_persistadp.c" ]
defines += [ defines += [
"__LITEOS_A__", "__LITEOS_A__",
"WORKSPACE_AREA_NEED_MUTEX", "WORKSPACE_AREA_NEED_MUTEX",
...@@ -121,9 +121,9 @@ static_library("param_client_lite") { ...@@ -121,9 +121,9 @@ static_library("param_client_lite") {
] ]
} else if (ohos_kernel_type == "liteos_m") { } else if (ohos_kernel_type == "liteos_m") {
sources += [ sources += [
"//base/startup/init_lite/services/param/liteos/param_hal.c", "//base/startup/init/services/param/liteos/param_hal.c",
"//base/startup/init_lite/services/param/liteos/param_service.c", "//base/startup/init/services/param/liteos/param_service.c",
"//base/startup/init_lite/services/param/manager/param_server.c", "//base/startup/init/services/param/manager/param_server.c",
] ]
if (enable_ohos_startup_init_lite_use_posix_file_api) { if (enable_ohos_startup_init_lite_use_posix_file_api) {
defines += [ "PARAM_SUPPORT_POSIX" ] defines += [ "PARAM_SUPPORT_POSIX" ]
...@@ -139,7 +139,7 @@ static_library("param_client_lite") { ...@@ -139,7 +139,7 @@ static_library("param_client_lite") {
} }
if (enable_ohos_startup_init_feature_begetctl_liteos) { if (enable_ohos_startup_init_feature_begetctl_liteos) {
deps = [ ":lite_ohos_param_to" ] 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" ] defines += [ "PARAM_LOAD_CFG_FROM_CODE" ]
} }
} }
......
services/param/watcher/BUILD.gn
浏览文件 @ c245c837
...@@ -20,27 +20,27 @@ ohos_prebuilt_etc("param_watcher.rc") { ...@@ -20,27 +20,27 @@ ohos_prebuilt_etc("param_watcher.rc") {
ohos_shared_library("param_watcher") { ohos_shared_library("param_watcher") {
sources = [ sources = [
"//base/startup/init_lite/services/utils/list.c", "//base/startup/init/services/utils/list.c",
"proxy/watcher_manager.cpp", "proxy/watcher_manager.cpp",
"proxy/watcher_manager_stub.cpp", "proxy/watcher_manager_stub.cpp",
"proxy/watcher_proxy.cpp", "proxy/watcher_proxy.cpp",
] ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/param/include", "//base/startup/init/services/param/include",
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/services/param/linux", "//base/startup/init/services/param/linux",
"//base/startup/init_lite/services/param/watcher/proxy", "//base/startup/init/services/param/watcher/proxy",
"//base/startup/init_lite/services/param/watcher/include", "//base/startup/init/services/param/watcher/include",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/services/loopevent/include", "//base/startup/init/services/loopevent/include",
"//third_party/cJSON", "//third_party/cJSON",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
] ]
......
services/utils/BUILD.gn
浏览文件 @ c245c837
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
config("exported_header_files") { config("exported_header_files") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
] ]
} }
...@@ -24,7 +24,7 @@ if (defined(ohos_lite)) { ...@@ -24,7 +24,7 @@ if (defined(ohos_lite)) {
sources = [ "init_utils.c" ] sources = [ "init_utils.c" ]
public_configs = [ ":exported_header_files" ] public_configs = [ ":exported_header_files" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
defines = [ defines = [
...@@ -38,7 +38,7 @@ if (defined(ohos_lite)) { ...@@ -38,7 +38,7 @@ if (defined(ohos_lite)) {
sources = [ "init_utils.c" ] sources = [ "init_utils.c" ]
public_configs = [ ":exported_header_files" ] public_configs = [ ":exported_header_files" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
defines = [ "_GNU_SOURCE" ] defines = [ "_GNU_SOURCE" ]
......
test/BUILD.gn
浏览文件 @ c245c837
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
group("testgroup") { group("testgroup") {
testonly = true testonly = true
......
test/exec_test/BUILD.gn
浏览文件 @ c245c837
...@@ -11,18 +11,18 @@ ...@@ -11,18 +11,18 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
import("//build/ohos.gni") import("//build/ohos.gni")
ohos_executable("client") { ohos_executable("client") {
sources = [ "client.c" ] sources = [ "client.c" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
install_images = [ "system" ] install_images = [ "system" ]
...@@ -35,9 +35,9 @@ ohos_executable("fd_holder_test") { ...@@ -35,9 +35,9 @@ ohos_executable("fd_holder_test") {
defines = [ "INIT_AGENT" ] 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_images = [ "system" ]
install_enable = true install_enable = true
...@@ -46,7 +46,7 @@ ohos_executable("fd_holder_test") { ...@@ -46,7 +46,7 @@ ohos_executable("fd_holder_test") {
} }
ohos_prebuilt_etc("fd_holder_test.cfg") { 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" part_name = "init"
module_install_dir = "etc/init" module_install_dir = "etc/init"
} }
...@@ -54,12 +54,12 @@ ohos_prebuilt_etc("fd_holder_test.cfg") { ...@@ -54,12 +54,12 @@ ohos_prebuilt_etc("fd_holder_test.cfg") {
ohos_executable("server") { ohos_executable("server") {
sources = [ "server.c" ] sources = [ "server.c" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
install_images = [ "system" ] install_images = [ "system" ]
......
test/fuzztest/BUILD.gn
浏览文件 @ c245c837
...@@ -20,7 +20,7 @@ import("//build/test.gni") ...@@ -20,7 +20,7 @@ import("//build/test.gni")
ohos_static_library("libfuzz_utils") { ohos_static_library("libfuzz_utils") {
sources = [ "utils/fuzz_utils.cpp" ] 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 = [] deps = []
part_name = "init" part_name = "init"
...@@ -29,15 +29,15 @@ ohos_static_library("libfuzz_utils") { ...@@ -29,15 +29,15 @@ ohos_static_library("libfuzz_utils") {
##############################fuzztest########################################## ##############################fuzztest##########################################
ohos_fuzztest("DoRebootFuzzTest") { ohos_fuzztest("DoRebootFuzzTest") {
module_out_path = module_output_path 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 = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
...@@ -54,16 +54,15 @@ ohos_fuzztest("DoRebootFuzzTest") { ...@@ -54,16 +54,15 @@ ohos_fuzztest("DoRebootFuzzTest") {
ohos_fuzztest("GetControlFileFuzzTest") { ohos_fuzztest("GetControlFileFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file = "//base/startup/init/test/fuzztest/getcontrolfile_fuzzer"
"//base/startup/init_lite/test/fuzztest/getcontrolfile_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
...@@ -80,17 +79,16 @@ ohos_fuzztest("GetControlFileFuzzTest") { ...@@ -80,17 +79,16 @@ ohos_fuzztest("GetControlFileFuzzTest") {
ohos_fuzztest("GetControlSocketFuzzTest") { ohos_fuzztest("GetControlSocketFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file = "//base/startup/init/test/fuzztest/getcontrolsocket_fuzzer"
"//base/startup/init_lite/test/fuzztest/getcontrolsocket_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//base/startup/init_lite/services/log:init_log", "//base/startup/init/services/log:init_log",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
...@@ -107,17 +105,16 @@ ohos_fuzztest("GetControlSocketFuzzTest") { ...@@ -107,17 +105,16 @@ ohos_fuzztest("GetControlSocketFuzzTest") {
ohos_fuzztest("MountAllFstabFuzzTest") { ohos_fuzztest("MountAllFstabFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file = "//base/startup/init/test/fuzztest/mountallfstab_fuzzer"
"//base/startup/init_lite/test/fuzztest/mountallfstab_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//base/startup/init_lite/test/fuzztest:libfuzz_utils", "//base/startup/init/test/fuzztest:libfuzz_utils",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
...@@ -134,17 +131,16 @@ ohos_fuzztest("MountAllFstabFuzzTest") { ...@@ -134,17 +131,16 @@ ohos_fuzztest("MountAllFstabFuzzTest") {
ohos_fuzztest("ReadFileInDirFuzzTest") { ohos_fuzztest("ReadFileInDirFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file = "//base/startup/init/test/fuzztest/readfileindir_fuzzer"
"//base/startup/init_lite/test/fuzztest/readfileindir_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/init/include", "//base/startup/init/services/init/include",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
...@@ -162,13 +158,13 @@ ohos_fuzztest("ReadFileInDirFuzzTest") { ...@@ -162,13 +158,13 @@ ohos_fuzztest("ReadFileInDirFuzzTest") {
ohos_fuzztest("ServiceControlStartFuzzTest") { ohos_fuzztest("ServiceControlStartFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file =
"//base/startup/init_lite/test/fuzztest/servicecontrolstart_fuzzer" "//base/startup/init/test/fuzztest/servicecontrolstart_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/test/fuzztest/utils/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" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
cflags = [ cflags = [
...@@ -185,13 +181,13 @@ ohos_fuzztest("ServiceControlStartFuzzTest") { ...@@ -185,13 +181,13 @@ ohos_fuzztest("ServiceControlStartFuzzTest") {
ohos_fuzztest("ServiceControlStopFuzzTest") { ohos_fuzztest("ServiceControlStopFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file =
"//base/startup/init_lite/test/fuzztest/servicecontrolstop_fuzzer" "//base/startup/init/test/fuzztest/servicecontrolstop_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/test/fuzztest/utils/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" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
cflags = [ cflags = [
...@@ -208,16 +204,16 @@ ohos_fuzztest("ServiceControlStopFuzzTest") { ...@@ -208,16 +204,16 @@ ohos_fuzztest("ServiceControlStopFuzzTest") {
ohos_fuzztest("SystemDumpParametersFuzzTest") { ohos_fuzztest("SystemDumpParametersFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file =
"//base/startup/init_lite/test/fuzztest/systemdumpparameters_fuzzer" "//base/startup/init/test/fuzztest/systemdumpparameters_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//base/startup/init_lite/test/fuzztest:libfuzz_utils", "//base/startup/init/test/fuzztest:libfuzz_utils",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
...@@ -236,15 +232,15 @@ ohos_fuzztest("SystemDumpParametersFuzzTest") { ...@@ -236,15 +232,15 @@ ohos_fuzztest("SystemDumpParametersFuzzTest") {
ohos_fuzztest("SystemFindParameterFuzzTest") { ohos_fuzztest("SystemFindParameterFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file =
"//base/startup/init_lite/test/fuzztest/systemfindparameter_fuzzer" "//base/startup/init/test/fuzztest/systemfindparameter_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
...@@ -263,15 +259,15 @@ ohos_fuzztest("SystemFindParameterFuzzTest") { ...@@ -263,15 +259,15 @@ ohos_fuzztest("SystemFindParameterFuzzTest") {
ohos_fuzztest("SystemGetParameterFuzzTest") { ohos_fuzztest("SystemGetParameterFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file =
"//base/startup/init_lite/test/fuzztest/systemgetparameter_fuzzer" "//base/startup/init/test/fuzztest/systemgetparameter_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
...@@ -290,15 +286,15 @@ ohos_fuzztest("SystemGetParameterFuzzTest") { ...@@ -290,15 +286,15 @@ ohos_fuzztest("SystemGetParameterFuzzTest") {
ohos_fuzztest("SystemGetParameterCommitIdFuzzTest") { ohos_fuzztest("SystemGetParameterCommitIdFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file =
"//base/startup/init_lite/test/fuzztest/systemgetparametercommitid_fuzzer" "//base/startup/init/test/fuzztest/systemgetparametercommitid_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
...@@ -319,15 +315,15 @@ ohos_fuzztest("SystemGetParameterCommitIdFuzzTest") { ...@@ -319,15 +315,15 @@ ohos_fuzztest("SystemGetParameterCommitIdFuzzTest") {
ohos_fuzztest("SystemGetParameterNameFuzzTest") { ohos_fuzztest("SystemGetParameterNameFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file =
"//base/startup/init_lite/test/fuzztest/systemgetparametername_fuzzer" "//base/startup/init/test/fuzztest/systemgetparametername_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
...@@ -347,15 +343,15 @@ ohos_fuzztest("SystemGetParameterNameFuzzTest") { ...@@ -347,15 +343,15 @@ ohos_fuzztest("SystemGetParameterNameFuzzTest") {
ohos_fuzztest("SystemGetParameterValueFuzzTest") { ohos_fuzztest("SystemGetParameterValueFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file =
"//base/startup/init_lite/test/fuzztest/systemgetparametervalue_fuzzer" "//base/startup/init/test/fuzztest/systemgetparametervalue_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
...@@ -375,15 +371,15 @@ ohos_fuzztest("SystemGetParameterValueFuzzTest") { ...@@ -375,15 +371,15 @@ ohos_fuzztest("SystemGetParameterValueFuzzTest") {
ohos_fuzztest("SystemSetParameterFuzzTest") { ohos_fuzztest("SystemSetParameterFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file =
"//base/startup/init_lite/test/fuzztest/systemsetparameter_fuzzer" "//base/startup/init/test/fuzztest/systemsetparameter_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
...@@ -402,18 +398,18 @@ ohos_fuzztest("SystemSetParameterFuzzTest") { ...@@ -402,18 +398,18 @@ ohos_fuzztest("SystemSetParameterFuzzTest") {
ohos_fuzztest("SystemTraversalParameterFuzzTest") { ohos_fuzztest("SystemTraversalParameterFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file =
"//base/startup/init_lite/test/fuzztest/systemtraversalparameter_fuzzer" "//base/startup/init/test/fuzztest/systemtraversalparameter_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/services/init/include", "//base/startup/init/services/init/include",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//base/startup/init_lite/test/fuzztest:libfuzz_utils", "//base/startup/init/test/fuzztest:libfuzz_utils",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
...@@ -433,15 +429,15 @@ ohos_fuzztest("SystemTraversalParameterFuzzTest") { ...@@ -433,15 +429,15 @@ ohos_fuzztest("SystemTraversalParameterFuzzTest") {
ohos_fuzztest("SystemWaitParameterFuzzTest") { ohos_fuzztest("SystemWaitParameterFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file =
"//base/startup/init_lite/test/fuzztest/systemwaitparameter_fuzzer" "//base/startup/init/test/fuzztest/systemwaitparameter_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
...@@ -460,17 +456,17 @@ ohos_fuzztest("SystemWaitParameterFuzzTest") { ...@@ -460,17 +456,17 @@ ohos_fuzztest("SystemWaitParameterFuzzTest") {
ohos_fuzztest("SystemWatchParameterFuzzTest") { ohos_fuzztest("SystemWatchParameterFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file =
"//base/startup/init_lite/test/fuzztest/systemwatchparameter_fuzzer" "//base/startup/init/test/fuzztest/systemwatchparameter_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/services/init/include", "//base/startup/init/services/init/include",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbeget_proxy", "//base/startup/init/interfaces/innerkits:libbeget_proxy",
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
"//utils/native/base:utils", "//utils/native/base:utils",
] ]
...@@ -495,17 +491,16 @@ ohos_fuzztest("SystemWatchParameterFuzzTest") { ...@@ -495,17 +491,16 @@ ohos_fuzztest("SystemWatchParameterFuzzTest") {
ohos_fuzztest("UmountAllFstabFuzzTest") { ohos_fuzztest("UmountAllFstabFuzzTest") {
module_out_path = module_output_path module_out_path = module_output_path
fuzz_config_file = fuzz_config_file = "//base/startup/init/test/fuzztest/umountallfstab_fuzzer"
"//base/startup/init_lite/test/fuzztest/umountallfstab_fuzzer"
include_dirs = [ include_dirs = [
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/test/fuzztest/utils/include", "//base/startup/init/test/fuzztest/utils/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//base/startup/init_lite/test/fuzztest:libfuzz_utils", "//base/startup/init/test/fuzztest:libfuzz_utils",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
......
test/moduletest/BUILD.gn
浏览文件 @ c245c837
...@@ -11,27 +11,27 @@ ...@@ -11,27 +11,27 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
import("//build/ohos.gni") import("//build/ohos.gni")
ohos_shared_library("libparamtestmodule") { ohos_shared_library("libparamtestmodule") {
sources = [ "param_test_module.c" ] sources = [ "param_test_module.c" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/init/include", "//base/startup/init/services/init/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/services/loopevent/include", "//base/startup/init/services/loopevent/include",
"//base/startup/init_lite/ueventd/include", "//base/startup/init/ueventd/include",
"//third_party/cJSON", "//third_party/cJSON",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
deps = [ deps = [
"//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//base/startup/init/interfaces/innerkits:libbegetutil",
"//base/startup/init_lite/services/log:agent_log", "//base/startup/init/services/log:agent_log",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
] ]
......
test/unittest/BUILD.gn
浏览文件 @ c245c837
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//base/startup/init_lite/begetd.gni") import("//base/startup/init/begetd.gni")
import("//build/test.gni") import("//build/test.gni")
config("utest_config") { config("utest_config") {
...@@ -33,92 +33,91 @@ config("utest_config") { ...@@ -33,92 +33,91 @@ config("utest_config") {
ohos_unittest("init_unittest") { ohos_unittest("init_unittest") {
module_out_path = "startup/init" module_out_path = "startup/init"
sources = [ sources = [
"//base/startup/init_lite/device_info/device_info.cpp", "//base/startup/init/device_info/device_info.cpp",
"//base/startup/init_lite/device_info/device_info_stub.cpp", "//base/startup/init/device_info/device_info_stub.cpp",
"//base/startup/init_lite/interfaces/innerkits/file/init_file.c", "//base/startup/init/interfaces/innerkits/file/init_file.c",
"//base/startup/init_lite/interfaces/innerkits/fs_manager/fstab.c", "//base/startup/init/interfaces/innerkits/fs_manager/fstab.c",
"//base/startup/init_lite/interfaces/innerkits/fs_manager/fstab_mount.c", "//base/startup/init/interfaces/innerkits/fs_manager/fstab_mount.c",
"//base/startup/init_lite/interfaces/innerkits/reboot/init_reboot_innerkits.c", "//base/startup/init/interfaces/innerkits/reboot/init_reboot_innerkits.c",
"//base/startup/init_lite/interfaces/innerkits/sandbox/sandbox.c", "//base/startup/init/interfaces/innerkits/sandbox/sandbox.c",
"//base/startup/init_lite/interfaces/innerkits/sandbox/sandbox_namespace.c", "//base/startup/init/interfaces/innerkits/sandbox/sandbox_namespace.c",
"//base/startup/init_lite/interfaces/innerkits/socket/init_socket.c", "//base/startup/init/interfaces/innerkits/socket/init_socket.c",
"//base/startup/init_lite/interfaces/innerkits/syspara/param_comm.c", "//base/startup/init/interfaces/innerkits/syspara/param_comm.c",
"//base/startup/init_lite/interfaces/innerkits/syspara/parameter.c", "//base/startup/init/interfaces/innerkits/syspara/parameter.c",
"//base/startup/init_lite/interfaces/innerkits/syspara/sysversion.c", "//base/startup/init/interfaces/innerkits/syspara/sysversion.c",
"//base/startup/init_lite/services/begetctl/param_cmd.c", "//base/startup/init/services/begetctl/param_cmd.c",
"//base/startup/init_lite/services/begetctl/shell/shell_bas.c", "//base/startup/init/services/begetctl/shell/shell_bas.c",
"//base/startup/init_lite/services/begetctl/shell/shell_main.c", "//base/startup/init/services/begetctl/shell/shell_main.c",
"//base/startup/init_lite/services/init/adapter/init_adapter.c", "//base/startup/init/services/init/adapter/init_adapter.c",
"//base/startup/init_lite/services/init/init_capability.c", "//base/startup/init/services/init/init_capability.c",
"//base/startup/init_lite/services/init/init_common_cmds.c", "//base/startup/init/services/init/init_common_cmds.c",
"//base/startup/init_lite/services/init/init_common_service.c", "//base/startup/init/services/init/init_common_service.c",
"//base/startup/init_lite/services/init/init_config.c", "//base/startup/init/services/init/init_config.c",
"//base/startup/init_lite/services/init/init_group_manager.c", "//base/startup/init/services/init/init_group_manager.c",
"//base/startup/init_lite/services/init/init_service_file.c", "//base/startup/init/services/init/init_service_file.c",
"//base/startup/init_lite/services/init/init_service_manager.c", "//base/startup/init/services/init/init_service_manager.c",
"//base/startup/init_lite/services/init/init_service_socket.c", "//base/startup/init/services/init/init_service_socket.c",
"//base/startup/init_lite/services/init/standard/device.c", "//base/startup/init/services/init/standard/device.c",
"//base/startup/init_lite/services/init/standard/init.c", "//base/startup/init/services/init/standard/init.c",
"//base/startup/init_lite/services/init/standard/init_cmdexecutor.c", "//base/startup/init/services/init/standard/init_cmdexecutor.c",
"//base/startup/init_lite/services/init/standard/init_cmds.c", "//base/startup/init/services/init/standard/init_cmds.c",
"//base/startup/init_lite/services/init/standard/init_jobs.c", "//base/startup/init/services/init/standard/init_jobs.c",
"//base/startup/init_lite/services/init/standard/init_mount.c", "//base/startup/init/services/init/standard/init_mount.c",
"//base/startup/init_lite/services/init/standard/init_reboot.c", "//base/startup/init/services/init/standard/init_reboot.c",
"//base/startup/init_lite/services/init/standard/init_service.c", "//base/startup/init/services/init/standard/init_service.c",
"//base/startup/init_lite/services/init/standard/init_signal_handler.c", "//base/startup/init/services/init/standard/init_signal_handler.c",
"//base/startup/init_lite/services/log/init_commlog.c", "//base/startup/init/services/log/init_commlog.c",
"//base/startup/init_lite/services/log/init_log.c", "//base/startup/init/services/log/init_log.c",
"//base/startup/init_lite/services/loopevent/loop/le_epoll.c", "//base/startup/init/services/loopevent/loop/le_epoll.c",
"//base/startup/init_lite/services/loopevent/loop/le_loop.c", "//base/startup/init/services/loopevent/loop/le_loop.c",
"//base/startup/init_lite/services/loopevent/signal/le_signal.c", "//base/startup/init/services/loopevent/signal/le_signal.c",
"//base/startup/init_lite/services/loopevent/socket/le_socket.c", "//base/startup/init/services/loopevent/socket/le_socket.c",
"//base/startup/init_lite/services/loopevent/task/le_asynctask.c", "//base/startup/init/services/loopevent/task/le_asynctask.c",
"//base/startup/init_lite/services/loopevent/task/le_streamtask.c", "//base/startup/init/services/loopevent/task/le_streamtask.c",
"//base/startup/init_lite/services/loopevent/task/le_task.c", "//base/startup/init/services/loopevent/task/le_task.c",
"//base/startup/init_lite/services/loopevent/task/le_watchtask.c", "//base/startup/init/services/loopevent/task/le_watchtask.c",
"//base/startup/init_lite/services/loopevent/timer/le_timer.c", "//base/startup/init/services/loopevent/timer/le_timer.c",
"//base/startup/init_lite/services/loopevent/utils/le_utils.c", "//base/startup/init/services/loopevent/utils/le_utils.c",
"//base/startup/init_lite/services/param/adapter/param_dac.c", "//base/startup/init/services/param/adapter/param_dac.c",
"//base/startup/init_lite/services/param/adapter/param_persistadp.c", "//base/startup/init/services/param/adapter/param_persistadp.c",
"//base/startup/init_lite/services/param/base/param_base.c", "//base/startup/init/services/param/base/param_base.c",
"//base/startup/init_lite/services/param/base/param_comm.c", "//base/startup/init/services/param/base/param_comm.c",
"//base/startup/init_lite/services/param/base/param_trie.c", "//base/startup/init/services/param/base/param_trie.c",
"//base/startup/init_lite/services/param/linux/param_message.c", "//base/startup/init/services/param/linux/param_message.c",
"//base/startup/init_lite/services/param/linux/param_msgadp.c", "//base/startup/init/services/param/linux/param_msgadp.c",
"//base/startup/init_lite/services/param/linux/param_osadp.c", "//base/startup/init/services/param/linux/param_osadp.c",
"//base/startup/init_lite/services/param/linux/param_request.c", "//base/startup/init/services/param/linux/param_request.c",
"//base/startup/init_lite/services/param/linux/param_service.c", "//base/startup/init/services/param/linux/param_service.c",
"//base/startup/init_lite/services/param/manager/param_manager.c", "//base/startup/init/services/param/manager/param_manager.c",
"//base/startup/init_lite/services/param/manager/param_persist.c", "//base/startup/init/services/param/manager/param_persist.c",
"//base/startup/init_lite/services/param/manager/param_server.c", "//base/startup/init/services/param/manager/param_server.c",
"//base/startup/init_lite/services/param/trigger/trigger_checker.c", "//base/startup/init/services/param/trigger/trigger_checker.c",
"//base/startup/init_lite/services/param/trigger/trigger_manager.c", "//base/startup/init/services/param/trigger/trigger_manager.c",
"//base/startup/init_lite/services/param/trigger/trigger_processor.c", "//base/startup/init/services/param/trigger/trigger_processor.c",
"//base/startup/init_lite/services/utils/init_hashmap.c", "//base/startup/init/services/utils/init_hashmap.c",
"//base/startup/init_lite/services/utils/init_utils.c", "//base/startup/init/services/utils/init_utils.c",
"//base/startup/init_lite/services/utils/list.c", "//base/startup/init/services/utils/list.c",
"//base/startup/init_lite/ueventd/standard/ueventd_parameter.c", "//base/startup/init/ueventd/standard/ueventd_parameter.c",
"//base/startup/init_lite/ueventd/ueventd.c", "//base/startup/init/ueventd/ueventd.c",
"//base/startup/init_lite/ueventd/ueventd_device_handler.c", "//base/startup/init/ueventd/ueventd_device_handler.c",
"//base/startup/init_lite/ueventd/ueventd_firmware_handler.c", "//base/startup/init/ueventd/ueventd_firmware_handler.c",
"//base/startup/init_lite/ueventd/ueventd_read_cfg.c", "//base/startup/init/ueventd/ueventd_read_cfg.c",
"//base/startup/init_lite/ueventd/ueventd_socket.c", "//base/startup/init/ueventd/ueventd_socket.c",
] ]
if (defined(build_selinux) && build_selinux) { if (defined(build_selinux) && build_selinux) {
sources += sources += [ "//base/startup/init/services/param/adapter/param_selinux.c" ]
[ "//base/startup/init_lite/services/param/adapter/param_selinux.c" ]
} }
if (enable_ohos_startup_init_feature_watcher) { if (enable_ohos_startup_init_feature_watcher) {
sources += [ sources += [
"//base/startup/init_lite/services/param/watcher/agent/watcher.cpp", "//base/startup/init/services/param/watcher/agent/watcher.cpp",
"//base/startup/init_lite/services/param/watcher/agent/watcher_manager_kits.cpp", "//base/startup/init/services/param/watcher/agent/watcher_manager_kits.cpp",
"//base/startup/init_lite/services/param/watcher/agent/watcher_manager_proxy.cpp", "//base/startup/init/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_stub.cpp",
"//base/startup/init_lite/services/param/watcher/proxy/watcher_manager.cpp", "//base/startup/init/services/param/watcher/proxy/watcher_manager.cpp",
"//base/startup/init_lite/services/param/watcher/proxy/watcher_manager_stub.cpp", "//base/startup/init/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/proxy/watcher_proxy.cpp",
] ]
} }
...@@ -147,58 +146,58 @@ ohos_unittest("init_unittest") { ...@@ -147,58 +146,58 @@ ohos_unittest("init_unittest") {
] ]
sources += [ sources += [
"//base/startup/init_lite/interfaces/innerkits/hookmgr/hookmgr.c", "//base/startup/init/interfaces/innerkits/hookmgr/hookmgr.c",
"//base/startup/init_lite/interfaces/innerkits/modulemgr/modulemgr.c", "//base/startup/init/interfaces/innerkits/modulemgr/modulemgr.c",
"innerkits/hookmgr_unittest.cpp", "innerkits/hookmgr_unittest.cpp",
"innerkits/modulemgr_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 = [ include_dirs = [
"//base/customization/config_policy/interfaces/innerkits/include", "//base/customization/config_policy/interfaces/innerkits/include",
"//base/startup/init_lite/device_info", "//base/startup/init/device_info",
"//base/startup/init_lite/services/init/standard", "//base/startup/init/services/init/standard",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/innerkits/include/syspara", "//base/startup/init/interfaces/innerkits/include/syspara",
"//base/startup/init_lite/interfaces/innerkits/fd_holder", "//base/startup/init/interfaces/innerkits/fd_holder",
"//base/startup/init_lite/interfaces/innerkits/syspara", "//base/startup/init/interfaces/innerkits/syspara",
"//base/startup/init_lite/interfaces/innerkits/control_fd", "//base/startup/init/interfaces/innerkits/control_fd",
"//base/startup/init_lite/services/begetctl", "//base/startup/init/services/begetctl",
"//base/startup/init_lite/services/begetctl/shell", "//base/startup/init/services/begetctl/shell",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/init/include", "//base/startup/init/services/init/include",
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/services/loopevent/include", "//base/startup/init/services/loopevent/include",
"//base/startup/init_lite/services/loopevent/loop", "//base/startup/init/services/loopevent/loop",
"//base/startup/init_lite/services/loopevent/socket", "//base/startup/init/services/loopevent/socket",
"//base/startup/init_lite/services/loopevent/signal", "//base/startup/init/services/loopevent/signal",
"//base/startup/init_lite/services/loopevent/task", "//base/startup/init/services/loopevent/task",
"//base/startup/init_lite/services/loopevent/timer", "//base/startup/init/services/loopevent/timer",
"//base/startup/init_lite/services/loopevent/utils", "//base/startup/init/services/loopevent/utils",
"//base/startup/init_lite/services/param/adapter", "//base/startup/init/services/param/adapter",
"//base/startup/init_lite/services/param/base", "//base/startup/init/services/param/base",
"//base/startup/init_lite/services/param/linux", "//base/startup/init/services/param/linux",
"//base/startup/init_lite/services/param/include", "//base/startup/init/services/param/include",
"//base/startup/init_lite/services/param/watcher/agent", "//base/startup/init/services/param/watcher/agent",
"//base/startup/init_lite/services/param/watcher/include", "//base/startup/init/services/param/watcher/include",
"//base/startup/init_lite/services/param/watcher/proxy", "//base/startup/init/services/param/watcher/proxy",
"//base/startup/init_lite/test/unittest", "//base/startup/init/test/unittest",
"//base/startup/init_lite/test/unittest/param", "//base/startup/init/test/unittest/param",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/distributedschedule/safwk/services/safwk/include", "//foundation/distributedschedule/safwk/services/safwk/include",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk",
"//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/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", "//utils/system/safwk/native/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//third_party/cJSON", "//third_party/cJSON",
"//base/security/access_token/interfaces/innerkits/token_setproc/include", "//base/security/access_token/interfaces/innerkits/token_setproc/include",
"//base/security/access_token/interfaces/innerkits/nativetoken/include", "//base/security/access_token/interfaces/innerkits/nativetoken/include",
"//base/startup/init_lite/interfaces/innerkits/sandbox/include", "//base/startup/init/interfaces/innerkits/sandbox/include",
"//base/startup/init_lite/interfaces/innerkits/hals", "//base/startup/init/interfaces/innerkits/hals",
] ]
deps = [ deps = [
...@@ -264,9 +263,9 @@ ohos_unittest("init_unittest") { ...@@ -264,9 +263,9 @@ ohos_unittest("init_unittest") {
} }
if (enable_ohos_startup_init_feature_deviceinfo) { if (enable_ohos_startup_init_feature_deviceinfo) {
sources += [ sources += [
"//base/startup/init_lite/device_info/device_info_kits.cpp", "//base/startup/init/device_info/device_info_kits.cpp",
"//base/startup/init_lite/device_info/device_info_load.cpp", "//base/startup/init/device_info/device_info_load.cpp",
"//base/startup/init_lite/device_info/device_info_proxy.cpp", "//base/startup/init/device_info/device_info_proxy.cpp",
] ]
defines += [ "PARAM_FEATURE_DEVICEINFO" ] defines += [ "PARAM_FEATURE_DEVICEINFO" ]
external_deps += [ "access_token:libaccesstoken_sdk" ] external_deps += [ "access_token:libaccesstoken_sdk" ]
......
test/unittest/lite/BUILD.gn
浏览文件 @ c245c837
...@@ -11,49 +11,49 @@ ...@@ -11,49 +11,49 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
if (defined(ohos_lite)) { 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/component/lite_component.gni")
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
if (ohos_kernel_type == "linux" || ohos_kernel_type == "liteos_a") { if (ohos_kernel_type == "linux" || ohos_kernel_type == "liteos_a") {
init_common_sources = [ init_common_sources = [
"//base/startup/init_lite/services/init/adapter/init_adapter.c", "//base/startup/init/services/init/adapter/init_adapter.c",
"//base/startup/init_lite/services/init/init_capability.c", "//base/startup/init/services/init/init_capability.c",
"//base/startup/init_lite/services/init/init_common_cmds.c", "//base/startup/init/services/init/init_common_cmds.c",
"//base/startup/init_lite/services/init/init_common_service.c", "//base/startup/init/services/init/init_common_service.c",
"//base/startup/init_lite/services/init/init_config.c", "//base/startup/init/services/init/init_config.c",
"//base/startup/init_lite/services/init/init_group_manager.c", "//base/startup/init/services/init/init_group_manager.c",
"//base/startup/init_lite/services/init/init_service_file.c", "//base/startup/init/services/init/init_service_file.c",
"//base/startup/init_lite/services/init/init_service_manager.c", "//base/startup/init/services/init/init_service_manager.c",
"//base/startup/init_lite/services/init/init_service_socket.c", "//base/startup/init/services/init/init_service_socket.c",
"//base/startup/init_lite/services/init/lite/init.c", "//base/startup/init/services/init/lite/init.c",
"//base/startup/init_lite/services/init/lite/init_cmds.c", "//base/startup/init/services/init/lite/init_cmds.c",
"//base/startup/init_lite/services/init/lite/init_jobs.c", "//base/startup/init/services/init/lite/init_jobs.c",
"//base/startup/init_lite/services/init/lite/init_reboot.c", "//base/startup/init/services/init/lite/init_reboot.c",
"//base/startup/init_lite/services/init/lite/init_service.c", "//base/startup/init/services/init/lite/init_service.c",
"//base/startup/init_lite/services/init/lite/init_signal_handler.c", "//base/startup/init/services/init/lite/init_signal_handler.c",
"//base/startup/init_lite/services/log/init_log.c", "//base/startup/init/services/log/init_log.c",
"//base/startup/init_lite/services/utils/init_utils.c", "//base/startup/init/services/utils/init_utils.c",
] ]
} }
param_common_sources = [ param_common_sources = [
"//base/startup/init_lite/services/param/manager/param_manager.c", "//base/startup/init/services/param/manager/param_manager.c",
"//base/startup/init_lite/services/param/manager/param_persist.c", "//base/startup/init/services/param/manager/param_persist.c",
"//base/startup/init_lite/services/param/manager/param_server.c", "//base/startup/init/services/param/manager/param_server.c",
] ]
base_sources = [ base_sources = [
"//base/startup/init_lite/services/log/init_commlog.c", "//base/startup/init/services/log/init_commlog.c",
"//base/startup/init_lite/services/param/base/param_base.c", "//base/startup/init/services/param/base/param_base.c",
"//base/startup/init_lite/services/param/base/param_comm.c", "//base/startup/init/services/param/base/param_comm.c",
"//base/startup/init_lite/services/param/base/param_trie.c", "//base/startup/init/services/param/base/param_trie.c",
"//base/startup/init_lite/services/utils/init_hashmap.c", "//base/startup/init/services/utils/init_hashmap.c",
"//base/startup/init_lite/services/utils/list.c", "//base/startup/init/services/utils/list.c",
] ]
sysparam_source = [ sysparam_source = [
"//base/startup/init_lite/interfaces/innerkits/syspara/param_comm.c", "//base/startup/init/interfaces/innerkits/syspara/param_comm.c",
"//base/startup/init_lite/interfaces/innerkits/syspara/parameter.c", "//base/startup/init/interfaces/innerkits/syspara/parameter.c",
"//base/startup/init_lite/interfaces/innerkits/syspara/sysversion.c", "//base/startup/init/interfaces/innerkits/syspara/sysversion.c",
] ]
unittest("init_test") { unittest("init_test") {
...@@ -79,31 +79,31 @@ if (defined(ohos_lite)) { ...@@ -79,31 +79,31 @@ if (defined(ohos_lite)) {
} }
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/services/init/include", "//base/startup/init/services/init/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/services/loopevent/include", "//base/startup/init/services/loopevent/include",
"//base/startup/init_lite/services/loopevent/timer", "//base/startup/init/services/loopevent/timer",
"//base/startup/init_lite/services/loopevent/task", "//base/startup/init/services/loopevent/task",
"//base/startup/init_lite/services/loopevent/utils", "//base/startup/init/services/loopevent/utils",
"//base/startup/init_lite/services/param/adapter", "//base/startup/init/services/param/adapter",
"//base/startup/init_lite/services/param/base", "//base/startup/init/services/param/base",
"//base/startup/init_lite/services/param/linux", "//base/startup/init/services/param/linux",
"//base/startup/init_lite/services/param/include", "//base/startup/init/services/param/include",
"//base/startup/init_lite/services/param/watcher/agent", "//base/startup/init/services/param/watcher/agent",
"//base/startup/init_lite/services/param/watcher/include", "//base/startup/init/services/param/watcher/include",
"//base/startup/init_lite/services/param/watcher/proxy", "//base/startup/init/services/param/watcher/proxy",
"//base/startup/init_lite/test/unittest", "//base/startup/init/test/unittest",
"//base/startup/init_lite/test/unittest/param", "//base/startup/init/test/unittest/param",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/innerkits/include/syspara", "//base/startup/init/interfaces/innerkits/include/syspara",
"//base/startup/init_lite/interfaces/innerkits/syspara", "//base/startup/init/interfaces/innerkits/syspara",
"//third_party/cJSON", "//third_party/cJSON",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//base/hiviewdfx/hilog_lite/interfaces/native/kits", "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
"//base/startup/init_lite/interfaces/innerkits/fd_holder", "//base/startup/init/interfaces/innerkits/fd_holder",
"//base/startup/init_lite/interfaces/hals", "//base/startup/init/interfaces/hals",
] ]
sources = sysparam_source sources = sysparam_source
...@@ -115,16 +115,16 @@ if (defined(ohos_lite)) { ...@@ -115,16 +115,16 @@ if (defined(ohos_lite)) {
defines += [ "__LITEOS_A__" ] defines += [ "__LITEOS_A__" ]
include_dirs += [ include_dirs += [
"//kernel/liteos_a/syscall", "//kernel/liteos_a/syscall",
"//base/startup/init_lite/interfaces/kits/syscap", "//base/startup/init/interfaces/kits/syscap",
"//base/startup/init_lite/initsync/include", "//base/startup/init/initsync/include",
] ]
sources += init_common_sources sources += init_common_sources
sources += [ sources += [
"//base/startup/init_lite/services/param/adapter/param_persistadp.c", "//base/startup/init/services/param/adapter/param_persistadp.c",
"//base/startup/init_lite/services/param/liteos/param_client.c", "//base/startup/init/services/param/liteos/param_client.c",
"//base/startup/init_lite/services/param/liteos/param_litedac.c", "//base/startup/init/services/param/liteos/param_litedac.c",
"//base/startup/init_lite/services/param/liteos/param_osadp.c", "//base/startup/init/services/param/liteos/param_osadp.c",
"//base/startup/init_lite/services/param/liteos/param_service.c", "//base/startup/init/services/param/liteos/param_service.c",
] ]
sources += [ sources += [
...@@ -139,15 +139,15 @@ if (defined(ohos_lite)) { ...@@ -139,15 +139,15 @@ if (defined(ohos_lite)) {
if (enable_ohos_startup_init_feature_begetctl_liteos) { if (enable_ohos_startup_init_feature_begetctl_liteos) {
deps += [ deps += [
"$ohos_product_adapter_dir/utils/sys_param:hal_sysparam", "$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" ] defines += [ "PARAM_LOAD_CFG_FROM_CODE" ]
} }
deps += [ deps += [
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
"//base/startup/init_lite/initsync:initsync", "//base/startup/init/initsync:initsync",
"//base/startup/init_lite/services/loopevent:loopevent", "//base/startup/init/services/loopevent:loopevent",
"//build/lite/config/component/cJSON:cjson_static", "//build/lite/config/component/cJSON:cjson_static",
"//third_party/mbedtls:mbedtls", "//third_party/mbedtls:mbedtls",
] ]
...@@ -156,11 +156,11 @@ if (defined(ohos_lite)) { ...@@ -156,11 +156,11 @@ if (defined(ohos_lite)) {
if (ohos_kernel_type == "liteos_m") { if (ohos_kernel_type == "liteos_m") {
defines += [ "__LITEOS_M__" ] defines += [ "__LITEOS_M__" ]
sources += [ sources += [
"//base/startup/init_lite/services/param/liteos/param_client.c", "//base/startup/init/services/param/liteos/param_client.c",
"//base/startup/init_lite/services/param/liteos/param_hal.c", "//base/startup/init/services/param/liteos/param_hal.c",
"//base/startup/init_lite/services/param/liteos/param_litedac.c", "//base/startup/init/services/param/liteos/param_litedac.c",
"//base/startup/init_lite/services/param/liteos/param_osadp.c", "//base/startup/init/services/param/liteos/param_osadp.c",
"//base/startup/init_lite/services/param/liteos/param_service.c", "//base/startup/init/services/param/liteos/param_service.c",
] ]
if (enable_ohos_startup_init_lite_use_posix_file_api) { if (enable_ohos_startup_init_lite_use_posix_file_api) {
defines += [ "PARAM_SUPPORT_POSIX" ] defines += [ "PARAM_SUPPORT_POSIX" ]
...@@ -174,10 +174,9 @@ if (defined(ohos_lite)) { ...@@ -174,10 +174,9 @@ if (defined(ohos_lite)) {
# add cfg.h # add cfg.h
if (enable_ohos_startup_init_feature_begetctl_liteos) { if (enable_ohos_startup_init_feature_begetctl_liteos) {
deps += [ deps +=
"//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" ]
include_dirs += [ "$root_out_dir/gen/init_lite" ]
defines += [ "PARAM_LOAD_CFG_FROM_CODE" ] defines += [ "PARAM_LOAD_CFG_FROM_CODE" ]
} }
deps += [ deps += [
...@@ -190,16 +189,16 @@ if (defined(ohos_lite)) { ...@@ -190,16 +189,16 @@ if (defined(ohos_lite)) {
sources += init_common_sources sources += init_common_sources
sources += [ sources += [
"//base/startup/init_lite/services/param/adapter/param_dac.c", "//base/startup/init/services/param/adapter/param_dac.c",
"//base/startup/init_lite/services/param/adapter/param_persistadp.c", "//base/startup/init/services/param/adapter/param_persistadp.c",
"//base/startup/init_lite/services/param/linux/param_message.c", "//base/startup/init/services/param/linux/param_message.c",
"//base/startup/init_lite/services/param/linux/param_msgadp.c", "//base/startup/init/services/param/linux/param_msgadp.c",
"//base/startup/init_lite/services/param/linux/param_osadp.c", "//base/startup/init/services/param/linux/param_osadp.c",
"//base/startup/init_lite/services/param/linux/param_request.c", "//base/startup/init/services/param/linux/param_request.c",
"//base/startup/init_lite/services/param/linux/param_service.c", "//base/startup/init/services/param/linux/param_service.c",
"//base/startup/init_lite/services/param/trigger/trigger_checker.c", "//base/startup/init/services/param/trigger/trigger_checker.c",
"//base/startup/init_lite/services/param/trigger/trigger_manager.c", "//base/startup/init/services/param/trigger/trigger_manager.c",
"//base/startup/init_lite/services/param/trigger/trigger_processor.c", "//base/startup/init/services/param/trigger/trigger_processor.c",
] ]
sources += [ sources += [
"../param/client_unittest.cpp", "../param/client_unittest.cpp",
...@@ -214,7 +213,7 @@ if (defined(ohos_lite)) { ...@@ -214,7 +213,7 @@ if (defined(ohos_lite)) {
} }
deps += [ deps += [
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//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", "//build/lite/config/component/cJSON:cjson_static",
"//third_party/mbedtls:mbedtls", "//third_party/mbedtls:mbedtls",
] ]
......
ueventd/BUILD.gn
浏览文件 @ c245c837
...@@ -14,34 +14,34 @@ ...@@ -14,34 +14,34 @@
if (defined(ohos_lite)) { if (defined(ohos_lite)) {
if (ohos_kernel_type == "linux") { if (ohos_kernel_type == "linux") {
service_ueventd_deps = [ service_ueventd_deps = [
"//base/startup/init_lite/interfaces/innerkits/socket:libsocket", "//base/startup/init/interfaces/innerkits/socket:libsocket",
"//base/startup/init_lite/services/log:init_log", "//base/startup/init/services/log:init_log",
"//base/startup/init_lite/services/param/base:parameterbase", "//base/startup/init/services/param/base:parameterbase",
"//base/startup/init_lite/services/utils:libinit_utils", "//base/startup/init/services/utils:libinit_utils",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
executable("ueventd_linux") { executable("ueventd_linux") {
sources = [ sources = [
"//base/startup/init_lite/services/utils/init_utils.c", "//base/startup/init/services/utils/init_utils.c",
"//base/startup/init_lite/services/utils/list.c", "//base/startup/init/services/utils/list.c",
"//base/startup/init_lite/ueventd/lite/ueventd_parameter.c", "//base/startup/init/ueventd/lite/ueventd_parameter.c",
"//base/startup/init_lite/ueventd/ueventd.c", "//base/startup/init/ueventd/ueventd.c",
"//base/startup/init_lite/ueventd/ueventd_device_handler.c", "//base/startup/init/ueventd/ueventd_device_handler.c",
"//base/startup/init_lite/ueventd/ueventd_firmware_handler.c", "//base/startup/init/ueventd/ueventd_firmware_handler.c",
"//base/startup/init_lite/ueventd/ueventd_main.c", "//base/startup/init/ueventd/ueventd_main.c",
"//base/startup/init_lite/ueventd/ueventd_read_cfg.c", "//base/startup/init/ueventd/ueventd_read_cfg.c",
"//base/startup/init_lite/ueventd/ueventd_socket.c", "//base/startup/init/ueventd/ueventd_socket.c",
] ]
defines = [ "__MUSL__" ] defines = [ "__MUSL__" ]
defines += [ "_GNU_SOURCE" ] defines += [ "_GNU_SOURCE" ]
include_dirs = [ include_dirs = [
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/services/utils", "//base/startup/init/services/utils",
"//base/startup/init_lite/ueventd/include", "//base/startup/init/ueventd/include",
] ]
deps = service_ueventd_deps deps = service_ueventd_deps
...@@ -55,27 +55,27 @@ if (defined(ohos_lite)) { ...@@ -55,27 +55,27 @@ if (defined(ohos_lite)) {
} else { } else {
import("//build/ohos.gni") import("//build/ohos.gni")
service_ueventd_sources = [ service_ueventd_sources = [
"//base/startup/init_lite/services/utils/list.c", "//base/startup/init/services/utils/list.c",
"//base/startup/init_lite/ueventd/ueventd.c", "//base/startup/init/ueventd/ueventd.c",
"//base/startup/init_lite/ueventd/ueventd_device_handler.c", "//base/startup/init/ueventd/ueventd_device_handler.c",
"//base/startup/init_lite/ueventd/ueventd_firmware_handler.c", "//base/startup/init/ueventd/ueventd_firmware_handler.c",
"//base/startup/init_lite/ueventd/ueventd_read_cfg.c", "//base/startup/init/ueventd/ueventd_read_cfg.c",
"//base/startup/init_lite/ueventd/ueventd_socket.c", "//base/startup/init/ueventd/ueventd_socket.c",
] ]
service_ueventd_include = [ service_ueventd_include = [
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//base/startup/init_lite/services/log", "//base/startup/init/services/log",
"//base/startup/init_lite/services/include", "//base/startup/init/services/include",
"//base/startup/init_lite/services/utils", "//base/startup/init/services/utils",
"//base/startup/init_lite/ueventd/include", "//base/startup/init/ueventd/include",
] ]
service_ueventd_deps = [ service_ueventd_deps = [
"//base/startup/init_lite/interfaces/innerkits/socket:libsocket", "//base/startup/init/interfaces/innerkits/socket:libsocket",
"//base/startup/init_lite/services/log:init_log", "//base/startup/init/services/log:init_log",
"//base/startup/init_lite/services/param/base:parameterbase", "//base/startup/init/services/param/base:parameterbase",
"//base/startup/init_lite/services/utils:libinit_utils", "//base/startup/init/services/utils:libinit_utils",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
...@@ -105,16 +105,16 @@ if (defined(ohos_lite)) { ...@@ -105,16 +105,16 @@ if (defined(ohos_lite)) {
ohos_executable("ueventd") { ohos_executable("ueventd") {
sources = service_ueventd_sources sources = service_ueventd_sources
sources += [ sources += [
"//base/startup/init_lite/ueventd/standard/ueventd_parameter.c", "//base/startup/init/ueventd/standard/ueventd_parameter.c",
"//base/startup/init_lite/ueventd/ueventd_main.c", "//base/startup/init/ueventd/ueventd_main.c",
] ]
include_dirs = service_ueventd_include include_dirs = service_ueventd_include
include_dirs += [ include_dirs += [
"//base/startup/init_lite/services/include/param", "//base/startup/init/services/include/param",
"//base/startup/init_lite/interfaces/innerkits/include", "//base/startup/init/interfaces/innerkits/include",
] ]
deps = service_ueventd_deps deps = service_ueventd_deps
deps += [ "//base/startup/init_lite/services/param/linux:param_client" ] deps += [ "//base/startup/init/services/param/linux:param_client" ]
cflags = [] cflags = []
if (build_selinux) { if (build_selinux) {
...@@ -131,7 +131,7 @@ if (defined(ohos_lite)) { ...@@ -131,7 +131,7 @@ if (defined(ohos_lite)) {
} }
ohos_prebuilt_etc("ueventd.config") { 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" part_name = "init"
install_images = [ install_images = [
"system", "system",
...@@ -152,9 +152,9 @@ group("startup_ueventd") { ...@@ -152,9 +152,9 @@ group("startup_ueventd") {
} }
} else { } else {
deps = [ deps = [
"//base/startup/init_lite/ueventd:libueventd_ramdisk_static", "//base/startup/init/ueventd:libueventd_ramdisk_static",
"//base/startup/init_lite/ueventd:ueventd", "//base/startup/init/ueventd:ueventd",
"//base/startup/init_lite/ueventd:ueventd.config", "//base/startup/init/ueventd:ueventd.config",
] ]
} }
} }
watchdog/BUILD.gn
浏览文件 @ c245c837
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
if (defined(ohos_lite)) { if (defined(ohos_lite)) {
executable("watchdog_service") { executable("watchdog_service") {
sources = [ sources = [
"//base/startup/init_lite/services/log/init_commlog.c", "//base/startup/init/services/log/init_commlog.c",
"//base/startup/init_lite/watchdog/init_watchdog.c", "//base/startup/init/watchdog/init_watchdog.c",
] ]
deps = [ deps = [
"//base/startup/init_lite/services/log:init_log", "//base/startup/init/services/log:init_log",
"//third_party/bounds_checking_function:libsec_static", "//third_party/bounds_checking_function:libsec_static",
] ]
defines = [ defines = [
...@@ -34,8 +34,8 @@ if (defined(ohos_lite)) { ...@@ -34,8 +34,8 @@ if (defined(ohos_lite)) {
ohos_executable("watchdog_service") { ohos_executable("watchdog_service") {
sources = [ "init_watchdog.c" ] sources = [ "init_watchdog.c" ]
deps = [ deps = [
"//base/startup/init_lite/services/log:init_log", "//base/startup/init/services/log:init_log",
"//base/startup/init_lite/services/param/base:parameterbase", "//base/startup/init/services/param/base:parameterbase",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
] ]
defines = [ "LINUX_WATCHDOG" ] defines = [ "LINUX_WATCHDOG" ]
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或