Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_34031325
engine
提交
4caa68b8
E
engine
项目概览
qq_34031325
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
4caa68b8
编写于
11月 01, 2017
作者:
Z
Zachary Anderson
提交者:
GitHub
11月 01, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[GN] Don't set dart_host_toolchain (#4308)
上级
88cf09ff
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
17 deletion
+7
-17
DEPS
DEPS
+1
-1
lib/snapshot/BUILD.gn
lib/snapshot/BUILD.gn
+2
-2
tools/gn
tools/gn
+4
-14
未找到文件。
DEPS
浏览文件 @
4caa68b8
...
@@ -114,7 +114,7 @@ allowed_hosts = [
...
@@ -114,7 +114,7 @@ allowed_hosts = [
]
]
deps = {
deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '
77c6728e5ac9fc7d08b163ed5bf8bc64fc463f21
',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '
5eb993a6018110a47486b211b30a4369bca4b722
',
# Fuchsia compatibility
# Fuchsia compatibility
#
#
...
...
lib/snapshot/BUILD.gn
浏览文件 @
4caa68b8
...
@@ -91,7 +91,7 @@ action("generate_snapshot_bin") {
...
@@ -91,7 +91,7 @@ action("generate_snapshot_bin") {
deps = [
deps = [
":generate_dart_ui",
":generate_dart_ui",
"//third_party/dart/runtime/bin:gen_snapshot($
dart_
host_toolchain)",
"//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)",
]
]
depfile = "$target_gen_dir/core_snapshot.d"
depfile = "$target_gen_dir/core_snapshot.d"
...
@@ -119,7 +119,7 @@ action("generate_snapshot_bin") {
...
@@ -119,7 +119,7 @@ action("generate_snapshot_bin") {
rebased_dart_ui_path = rebase_path(dart_ui_path)
rebased_dart_ui_path = rebase_path(dart_ui_path)
gen_snapshot_dir =
gen_snapshot_dir =
get_label_info("//third_party/dart/runtime/bin:gen_snapshot($
dart_
host_toolchain)",
get_label_info("//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)",
"root_out_dir")
"root_out_dir")
script = "//third_party/dart/runtime/tools/create_snapshot_bin.py"
script = "//third_party/dart/runtime/tools/create_snapshot_bin.py"
...
...
tools/gn
浏览文件 @
4caa68b8
...
@@ -132,22 +132,12 @@ def to_gn_args(args):
...
@@ -132,22 +132,12 @@ def to_gn_args(args):
if
'target_cpu'
in
gn_args
:
if
'target_cpu'
in
gn_args
:
gn_args
[
'target_cpu'
]
=
cpu_for_target_arch
(
gn_args
[
'target_cpu'
])
gn_args
[
'target_cpu'
]
=
cpu_for_target_arch
(
gn_args
[
'target_cpu'
])
# Modify host_toolchain into dart_host_toolchain so it matches word size of target_cpu
# Make sure the host toolchain has the same bit width as the target
# toolchain. This ensures that Dart's gen_snapshot generates the right
# code for the target.
target_is_32_bit
=
gn_args
[
'target_cpu'
]
==
'arm'
or
gn_args
[
'target_cpu'
]
==
'x86'
target_is_32_bit
=
gn_args
[
'target_cpu'
]
==
'arm'
or
gn_args
[
'target_cpu'
]
==
'x86'
if
target_is_32_bit
:
if
target_is_32_bit
:
if
sys
.
platform
.
startswith
(
'linux'
):
gn_args
[
'host_cpu'
]
=
'x86'
;
gn_args
[
'dart_host_toolchain'
]
=
"//build/toolchain/linux:clang_x86"
elif
sys
.
platform
.
startswith
(
'darwin'
):
gn_args
[
'dart_host_toolchain'
]
=
"//build/toolchain/mac:clang_i386"
elif
sys
.
platform
.
startswith
(
'win'
):
gn_args
[
'dart_host_toolchain'
]
=
"//build/toolchain/win:x86"
else
:
if
sys
.
platform
.
startswith
(
'linux'
):
gn_args
[
'dart_host_toolchain'
]
=
"//build/toolchain/linux:clang_x64"
elif
sys
.
platform
.
startswith
(
'darwin'
):
gn_args
[
'dart_host_toolchain'
]
=
"//build/toolchain/mac:clang_x64"
elif
sys
.
platform
.
startswith
(
'win'
):
gn_args
[
'dart_host_toolchain'
]
=
"//build/toolchain/win:x64"
gn_args
[
'flutter_runtime_mode'
]
=
args
.
runtime_mode
gn_args
[
'flutter_runtime_mode'
]
=
args
.
runtime_mode
gn_args
[
'flutter_aot'
]
=
aot
gn_args
[
'flutter_aot'
]
=
aot
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录