Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Startup Init Lite
提交
9f8bad4b
S
Startup Init Lite
项目概览
OpenHarmony
/
Startup Init Lite
大约 1 年 前同步成功
通知
3
Star
37
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Startup Init Lite
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9f8bad4b
编写于
6月 30, 2022
作者:
M
Mupceet
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
解决编译随机失败
Signed-off-by:
N
Mupceet
<
laiguizhong@huawei.com
>
上级
3137109c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
63 deletion
+29
-63
scripts/param_cfg_to_code.py
scripts/param_cfg_to_code.py
+13
-15
services/param/liteos/BUILD.gn
services/param/liteos/BUILD.gn
+15
-45
test/unittest/lite/BUILD.gn
test/unittest/lite/BUILD.gn
+1
-3
未找到文件。
scripts/param_cfg_to_code.py
浏览文件 @
9f8bad4b
...
...
@@ -130,36 +130,34 @@ def main():
description
=
'A common change param.para file to h.'
)
parser
.
add_argument
(
'--source'
,
action
=
'append'
,
help
=
'The source to change.'
,
required
=
True
)
parser
.
add_argument
(
'--dest_dir'
,
help
=
'Path that the source should be changed to.'
,
required
=
True
)
parser
.
add_argument
(
'--priority'
,
help
=
'If priority is 1, replace the parameter if it exist.'
,
required
=
True
)
args
=
parser
.
parse_args
()
out_dir
=
args
.
dest_dir
if
not
os
.
path
.
exists
(
out_dir
):
os
.
makedirs
(
out_dir
,
exist_ok
=
True
)
print
(
out_dir
)
print
(
"out_dir "
+
out_dir
)
source
=
args
.
source
assert
os
.
path
.
exists
(
source
)
for
source
in
args
.
source
:
print
(
"source "
+
source
)
assert
os
.
path
.
exists
(
source
)
srcDict
=
GetParamFromCfg
(
source
)
dst
=
out_dir
+
"param_cfg.h"
srcDict
=
GetParamFromCfg
(
source
)
dst
=
out_dir
+
"param_cfg.h"
if
os
.
path
.
exists
(
dst
):
dstDict
=
GetParamFromCCode
(
dst
)
else
:
dstDict
=
{}
if
os
.
path
.
exists
(
dst
):
dstDict
=
GetParamFromCCode
(
dst
)
else
:
dstDict
=
{}
dstDict
=
AddToCodeDict
(
dstDict
,
srcDict
,
args
.
priority
==
"1"
)
WriteMapToCode
(
dst
,
dstDict
)
dstDict
=
AddToCodeDict
(
dstDict
,
srcDict
,
False
)
WriteMapToCode
(
dst
,
dstDict
)
return
0
...
...
services/param/liteos/BUILD.gn
浏览文件 @
9f8bad4b
...
...
@@ -35,46 +35,20 @@ param_build_defines = [
"BUILD_ROOTHASH=\"${ohos_build_roothash}\"",
]
if (enable_ohos_startup_init_feature_begetctl_liteos) {
action("lite_const_param_to") {
script = "//base/startup/init_lite/scripts/param_cfg_to_code.py"
args = [
"--source",
rebase_path(
"//base/startup/init_lite/services/etc_lite/param/ohos_const/ohos.para"),
"--dest_dir",
rebase_path("$root_out_dir/gen/init_lite/"),
"--priority",
"0",
]
outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ]
}
action("lite_ohos_param_to") {
script = "//base/startup/init_lite/scripts/param_cfg_to_code.py"
args = [
"--source",
rebase_path("//base/startup/init_lite/services/etc/param/ohos.para"),
"--dest_dir",
rebase_path("$root_out_dir/gen/init_lite/"),
"--priority",
"0",
]
outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ]
}
action("vendor_param_to") {
script = "//base/startup/init_lite/scripts/param_cfg_to_code.py"
args = [
"--source",
rebase_path("$ohos_product_adapter_dir/utils/sys_param/vendor.para"),
"--dest_dir",
rebase_path("$root_out_dir/gen/init_lite/"),
"--priority",
"1",
]
outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ]
}
action("lite_ohos_param_to") {
script = "//base/startup/init_lite/scripts/param_cfg_to_code.py"
args = [
"--source",
rebase_path(
"//base/startup/init_lite/services/etc_lite/param/ohos_const/ohos.para"),
"--source",
rebase_path("$ohos_product_adapter_dir/utils/sys_param/vendor.para"),
"--source",
rebase_path("//base/startup/init_lite/services/etc/param/ohos.para"),
"--dest_dir",
rebase_path("$root_out_dir/gen/init_lite/"),
]
outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ]
}
config("exported_header_files") {
...
...
@@ -162,11 +136,7 @@ static_library("param_client_lite") {
"DATA_PATH=\"${config_ohos_startup_init_lite_data_path}\"",
]
if (enable_ohos_startup_init_feature_begetctl_liteos) {
deps = [
":lite_const_param_to",
":lite_ohos_param_to",
":vendor_param_to",
]
deps = [ ":lite_ohos_param_to" ]
include_dirs += [ "$root_out_dir/gen/init_lite" ]
defines += [ "PARAM_LOAD_CFG_FROM_CODE" ]
}
...
...
test/unittest/lite/BUILD.gn
浏览文件 @
9f8bad4b
...
...
@@ -139,7 +139,6 @@ if (defined(ohos_lite)) {
if (enable_ohos_startup_init_feature_begetctl_liteos) {
deps += [
"$ohos_product_adapter_dir/utils/sys_param:hal_sysparam",
"//base/startup/init_lite/services/param/liteos:lite_const_param_to",
"//base/startup/init_lite/services/param/liteos:lite_ohos_param_to",
]
include_dirs += [ "$root_out_dir/gen/init_lite" ]
...
...
@@ -180,8 +179,7 @@ if (defined(ohos_lite)) {
# add cfg.h
if (enable_ohos_startup_init_feature_begetctl_liteos) {
deps += [
"//base/startup/init_lite/services/param:lite_const_param_to",
"//base/startup/init_lite/services/param:lite_ohos_param_to",
"//base/startup/init_lite/services/param/liteos:lite_ohos_param_to",
]
include_dirs += [ "$root_out_dir/gen/init_lite" ]
defines += [ "PARAM_LOAD_CFG_FROM_CODE" ]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录