未验证 提交 8c1f0e58 编写于 作者: O openharmony_ci 提交者: Gitee

!1420 统一设备侧沙盒扩展json配置文件,设备侧不区分32位/64位

Merge pull request !1420 from yichengzhao/cherry-pick-1666337176
......@@ -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"
......
......@@ -187,6 +187,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"
module_install_dir = "etc/sandbox"
}
......@@ -197,6 +199,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"
module_install_dir = "etc/sandbox"
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册