Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Build Lite
提交
3ef832e6
B
Build Lite
项目概览
OpenHarmony
/
Build Lite
9 个月 前同步成功
通知
22
Star
24
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
B
Build Lite
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
3ef832e6
编写于
9月 29, 2022
作者:
O
openharmony_ci
提交者:
Gitee
9月 29, 2022
浏览文件
操作
浏览文件
下载
差异文件
!603 编译框架支持UniProton内核
Merge pull request !603 from zhushengle/uniproton
上级
87098f8e
58360a88
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
5 deletion
+19
-5
BUILD.gn
BUILD.gn
+6
-0
config/BUILD.gn
config/BUILD.gn
+5
-0
config/BUILDCONFIG.gn
config/BUILDCONFIG.gn
+3
-2
config/component/lite_component.gni
config/component/lite_component.gni
+4
-2
ohos_var.gni
ohos_var.gni
+1
-1
未找到文件。
BUILD.gn
浏览文件 @
3ef832e6
...
@@ -90,6 +90,12 @@ group("ohos") {
...
@@ -90,6 +90,12 @@ group("ohos") {
"//kernel/liteos_m:build_kernel_image") {
"//kernel/liteos_m:build_kernel_image") {
deps += [ component_target ]
deps += [ component_target ]
}
}
} else if (product_configed_component.component ==
"uniproton") {
if (component_target !=
"//kernel/uniproton:build_kernel_image") {
deps += [ component_target ]
}
} else {
} else {
deps += [ component_target ]
deps += [ component_target ]
}
}
...
...
config/BUILD.gn
浏览文件 @
3ef832e6
...
@@ -37,6 +37,11 @@ config("kernel_macros") {
...
@@ -37,6 +37,11 @@ config("kernel_macros") {
"__LITEOS__",
"__LITEOS__",
"__LITEOS_M__",
"__LITEOS_M__",
]
]
} else if (ohos_kernel_type == "uniproton") {
defines = [
"__uniproton__",
"__UNIPROTON__",
]
} else if (ohos_kernel_type == "linux") {
} else if (ohos_kernel_type == "linux") {
defines = [
defines = [
"__linux__",
"__linux__",
...
...
config/BUILDCONFIG.gn
浏览文件 @
3ef832e6
...
@@ -41,7 +41,8 @@ if (defined(board_configed_sysroot) && board_configed_sysroot != "") {
...
@@ -41,7 +41,8 @@ if (defined(board_configed_sysroot) && board_configed_sysroot != "") {
}
}
# Only gcc available for liteos_m.
# Only gcc available for liteos_m.
if (ohos_kernel_type == "liteos_m" || ohos_kernel_type == "linux") {
if (ohos_kernel_type == "liteos_m" || ohos_kernel_type == "uniproton" ||
ohos_kernel_type == "linux") {
use_board_toolchain = true
use_board_toolchain = true
}
}
...
@@ -154,7 +155,7 @@ default_shared_library_configs =
...
@@ -154,7 +155,7 @@ default_shared_library_configs =
default_target_configs + [ "//build/lite/config:shared_library_config" ]
default_target_configs + [ "//build/lite/config:shared_library_config" ]
default_static_library_configs = default_target_configs
default_static_library_configs = default_target_configs
default_executable_configs = default_static_library_configs
default_executable_configs = default_static_library_configs
if (ohos_kernel_type != "liteos_m") {
if (ohos_kernel_type != "liteos_m"
&& ohos_kernel_type != "uniproton"
) {
default_static_library_configs += [ "//build/lite/config:static_pie_config" ]
default_static_library_configs += [ "//build/lite/config:static_pie_config" ]
default_executable_configs += [ "//build/lite/config:static_pie_config" ]
default_executable_configs += [ "//build/lite/config:static_pie_config" ]
default_executable_configs += [ "//build/lite/config:pie_executable_config" ]
default_executable_configs += [ "//build/lite/config:pie_executable_config" ]
...
...
config/component/lite_component.gni
浏览文件 @
3ef832e6
...
@@ -19,7 +19,8 @@ template("lite_library") {
...
@@ -19,7 +19,8 @@ template("lite_library") {
target_type = invoker.target_type
target_type = invoker.target_type
shared_lib = target_type == "shared_library"
shared_lib = target_type == "shared_library"
if (shared_lib && ohos_kernel_type == "liteos_m") {
if (shared_lib &&
(ohos_kernel_type == "liteos_m" || ohos_kernel_type == "uniproton")) {
group(target_name) {
group(target_name) {
if (defined(invoker.sources)) {
if (defined(invoker.sources)) {
assert(invoker.sources != "")
assert(invoker.sources != "")
...
@@ -57,7 +58,8 @@ template("lite_library") {
...
@@ -57,7 +58,8 @@ template("lite_library") {
if (shared_lib) {
if (shared_lib) {
cflags += [ "-fPIC" ]
cflags += [ "-fPIC" ]
cflags_cc += [ "-fPIC" ]
cflags_cc += [ "-fPIC" ]
} else if (!shared_lib && ohos_kernel_type != "liteos_m") {
} else if (!shared_lib && (ohos_kernel_type != "liteos_m" &&
ohos_kernel_type != "uniproton")) {
cflags += [ "-fPIE" ]
cflags += [ "-fPIE" ]
cflags_cc += [ "-fPIE" ]
cflags_cc += [ "-fPIE" ]
}
}
...
...
ohos_var.gni
浏览文件 @
3ef832e6
...
@@ -64,7 +64,7 @@ if (product_config_path != "") {
...
@@ -64,7 +64,7 @@ if (product_config_path != "") {
board_name = product_config.board
board_name = product_config.board
device_company = product_config.device_company
device_company = product_config.device_company
# Supported kernel: "liteos_a", "liteos_m", "linux"
# Supported kernel: "liteos_a", "liteos_m", "linux"
, "uniproton"
ohos_kernel_type = product_config.kernel_type
ohos_kernel_type = product_config.kernel_type
if (defined(product_config.kernel_is_prebuilt)) {
if (defined(product_config.kernel_is_prebuilt)) {
ohos_kernel_is_prebuilt = product_config.kernel_is_prebuilt
ohos_kernel_is_prebuilt = product_config.kernel_is_prebuilt
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录