openharmony/startup_init
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_init synced 2025-03-03 18:17:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!671 解决sysparam和begetutils符号一致

Browse Source 
Merge pull request !671 from Mupceet/init0524
This commit is contained in:
openharmony_ci 2022-05-24 12:24:24 +00:00 committed by Gitee
commit b1822e6cce
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
interfaces/innerkits/BUILD.gn
View File

@ -297,4 +297,43 @@ if (defined(ohos_lite)) {
part_name = "init"
}
ohos_static_library("libbegetutil_static") {
sources = [ "//base/startup/init_lite/services/log/init_log.c" ]
sources += syspara_sources
sources += [ "syspara/param_wrapper.cpp" ]
defines = [
"INIT_AGENT",
"INIT_FILE",
"_GNU_SOURCE",
]
if (target_cpu == "arm64") {
defines += [ "SUPPORT_64BIT" ]
}
include_dirs = [
"./include",
"//third_party/bounds_checking_function/include",
"//base/startup/init_lite/services/include",
"//base/startup/init_lite/services/include/param",
"//base/startup/init_lite/services/param/include",
"//base/startup/init_lite/interfaces/innerkits/include",
"//base/startup/init_lite/interfaces/innerkits/include/syspara",
"//base/startup/init_lite/interfaces/innerkits/syspara",
]
deps = [
"//base/startup/init_lite/services/loopevent:loopevent",
"//base/startup/init_lite/services/param:param_client",
"//base/startup/init_lite/services/utils:libinit_tools",
"//base/startup/init_lite/services/utils:libinit_utils",
"//third_party/bounds_checking_function:libsec_shared",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [
"hilog_native:libhilog_base",
"utils_base:utils",
]
part_name = "init"
}
}

9
interfaces/innerkits/syspara/parameter.c
View File

@ -231,8 +231,13 @@ const char *GetBuildTime(void)
const char *GetSerial(void)
{
static const char *ohos_serial = NULL;
return GetProperty("ohos.boot.sn", &ohos_serial);
static char ohos_serial[PARAM_VALUE_LEN_MAX] = {0};
uint32_t len = PARAM_VALUE_LEN_MAX;
int ret = SystemGetParameter("ohos.boot.sn", ohos_serial, &len);
if (ret != 0) {
return NULL;
}
return ohos_serial;
}
int GetDevUdid(char *udid, int size)