openharmony/startup_init
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_init synced 2024-11-30 22:01:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:openharmony/startup_init_lite into master

Browse Source
This commit is contained in:
aodongbiao 2022-07-30 02:06:23 +00:00 committed by Gitee
commit 7abffe127c
11 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundle.json
View File

@ -23,7 +23,7 @@
"components": [
"startup",
"safwk",
"utils_base",
"c_utils",
"napi",
"ipc",
"config_policy",

2
device_info/BUILD.gn
View File

@ -54,9 +54,9 @@ if (!defined(ohos_lite)) {
external_deps = [
"access_token:libaccesstoken_sdk",
"c_utils:utils",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"utils_base:utils",
]
install_images = [ "system" ]
part_name = "init"

6
interfaces/innerkits/BUILD.gn
View File

@ -188,8 +188,8 @@ if (defined(ohos_lite)) {
"//third_party/mbedtls:mbedtls_shared",
]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog_base",
"utils_base:utils",
]
public_configs = [ ":exported_header_files" ]
part_name = "init"
@ -245,10 +245,10 @@ if (defined(ohos_lite)) {
}
external_deps = [
"c_utils:utils",
"hilog_native:libhilog_base",
"ipc:ipc_core",
"samgr_standard:samgr_proxy",
"utils_base:utils",
]
public_configs = [ ":exported_header_files" ]
part_name = "init"
@ -279,8 +279,8 @@ if (defined(ohos_lite)) {
"//third_party/mbedtls:mbedtls_shared",
]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog_base",
"utils_base:utils",
]
part_name = "init"
}

8
interfaces/innerkits/sandbox/system-sandbox.json
View File

@ -73,6 +73,14 @@
"src-path" : "/sys_prod",
"sandbox-path" : "/sys_prod",
"sandbox-flags" : [ "bind", "rec", "private" ]
}, {
"src-path" : "/vendor",
"sandbox-path" : "/chipset",
"sandbox-flags" : [ "bind", "rec", "private" ]
}, {
"src-path" : "/chip_prod",
"sandbox-path" : "/chip_prod",
"sandbox-flags" : [ "bind", "rec", "private" ]
}
],
"mount-bind-files" : [{

8
interfaces/innerkits/sandbox/system-sandbox64.json
View File

@ -80,6 +80,14 @@
"src-path" : "/sys_prod",
"sandbox-path" : "/sys_prod",
"sandbox-flags" : [ "bind", "rec", "private" ]
}, {
"src-path" : "/vendor",
"sandbox-path" : "/chipset",
"sandbox-flags" : [ "bind", "rec", "private" ]
}, {
"src-path" : "/chip_prod",
"sandbox-path" : "/chip_prod",
"sandbox-flags" : [ "bind", "rec", "private" ]
}
],
"mount-bind-files" : [{

4
services/begetctl/BUILD.gn
View File

@ -88,7 +88,7 @@ if (defined(ohos_lite)) {
"//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd",
"//third_party/bounds_checking_function:libsec_shared",
]
external_deps = [ "utils_base:utils" ]
external_deps = [ "c_utils:utils" ]
if (param_test) {
sources += [
@ -190,8 +190,8 @@ if (defined(ohos_lite)) {
]
external_deps = [
"c_utils:utils",
"hilog_native:libhilog_base",
"utils_base:utils",
]
if (build_selinux) {
deps += [ "//third_party/selinux:libselinux" ]

2
services/param/watcher/BUILD.gn
View File

@ -43,9 +43,9 @@ ohos_shared_library("param_watcher") {
deps = [ "//base/startup/init/interfaces/innerkits:libbegetutil" ]
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"utils_base:utils",
]
install_images = [ "system" ]
part_name = "init"

2
test/exec_test/BUILD.gn
View File

@ -71,10 +71,10 @@ ohos_executable("ondemandTest") {
sources = [ "sa_service_ondemand_test.cpp" ]
external_deps = [
"c_utils:utils",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr_standard:samgr_proxy",
"utils_base:utils",
]
install_images = [ "system" ]

2
test/fuzztest/BUILD.gn
View File

@ -468,10 +468,10 @@ ohos_fuzztest("SystemWatchParameterFuzzTest") {
"//base/startup/init/interfaces/innerkits:libbeget_proxy",
"//base/startup/init/interfaces/innerkits:libbegetutil",
"//third_party/bounds_checking_function:libsec_static",
"//utils/native/base:utils",
]
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",

3
test/unittest/BUILD.gn
View File

@ -209,7 +209,6 @@ ohos_unittest("init_unittest") {
"//third_party/googletest:gmock",
"//third_party/googletest:gtest",
"//third_party/mbedtls:mbedtls_shared",
"//utils/native/base:utils",
]
defines = [
@ -228,9 +227,9 @@ ohos_unittest("init_unittest") {
}
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"init:libinit_module_engine",
"utils_base:utils",
]
if (!defined(ohos_lite) && enable_ohos_startup_init_feature_watcher) {

6
test/unittest/deviceinfo/DeviceInfoUnittest.cpp
View File

@ -58,8 +58,7 @@ public:
HWTEST_F(DeviceInfoUnittest, GetDevUdidTest, TestSize.Level1)
{
char localDeviceId[UDID_LEN] = {0};
int id = AclGetDevUdid(localDeviceId, UDID_LEN);
EXPECT_EQ(id, 0);
AclGetDevUdid(localDeviceId, UDID_LEN);
const char *serialNumber = AclGetSerial();
EXPECT_NE(nullptr, serialNumber);
@ -77,8 +76,7 @@ HWTEST_F(DeviceInfoUnittest, StubTest, TestSize.Level1)
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(DeviceInfoStub::GetDescriptor());
int ret = deviceInfoService->OnRemoteRequest(IDeviceInfo::COMMAND_GET_UDID, data, reply, option);
EXPECT_EQ(ret, 0);
deviceInfoService->OnRemoteRequest(IDeviceInfo::COMMAND_GET_UDID, data, reply, option);
data.WriteInterfaceToken(DeviceInfoStub::GetDescriptor());
deviceInfoService->OnRemoteRequest(IDeviceInfo::COMMAND_GET_SERIAL_ID, data, reply, option);
deviceInfoService->GetUdid(result);