提交 1cd06d78 编写于 作者: H handyohos 提交者: yichengzhao

fixed 24ad86bd from https://gitee.com/YiYiYiol/startup_init_lite/pulls/1420

fixed b7685072 from https://gitee.com/YiYiYiol/startup_init_lite/pulls/1416
bugfix: unify sandbox config file name.

unify sandbox config file name.
Signed-off-by: Nhandyohos <zhangxiaotian@huawei.com>
Change-Id: I249673be8e3fe9a4ac3bb2889c2ea9a9af2cf34f
上级 b9fea397
......@@ -42,13 +42,8 @@
#define SANDBOX_SYMLINK_TARGET "target-name"
#define SANDBOX_SYMLINK_NAME "link-name"
#ifndef SUPPORT_64BIT
#define SANDBOX_SYSTEM_CONFIG_FILE "etc/sandbox/system-sandbox.json"
#define SANDBOX_CHIPSET_CONFIG_FILE "etc/sandbox/chipset-sandbox.json"
#else
#define SANDBOX_SYSTEM_CONFIG_FILE "etc/sandbox/system-sandbox64.json"
#define SANDBOX_CHIPSET_CONFIG_FILE "etc/sandbox/chipset-sandbox64.json"
#endif
#ifdef STARTUP_INIT_TEST
#define SANDBOX_TEST_CONFIG_FILE "/data/init_ut/test-sandbox.json"
......
......@@ -192,6 +192,8 @@ if (defined(ohos_lite)) {
source =
"//base/startup/init/interfaces/innerkits/sandbox/system-sandbox.json"
}
output =
"//base/startup/init/interfaces/innerkits/sandbox/system-sandbox.json"
part_name = "init"
subsystem_name = "startup"
module_install_dir = "etc/sandbox"
......@@ -203,6 +205,8 @@ if (defined(ohos_lite)) {
} else {
source = "//base/startup/init/interfaces/innerkits/sandbox/chipset-sandbox.json"
}
output =
"//base/startup/init/interfaces/innerkits/sandbox/chipset-sandbox.json"
part_name = "init"
subsystem_name = "startup"
module_install_dir = "etc/sandbox"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册