Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
6974f779
E
engine
项目概览
sxychenjing
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
6974f779
编写于
4月 22, 2016
作者:
Y
Yegor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
libdart_precompiled_runtime is gone; fix ios build (#2613)
上级
7a919c0f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
16 deletion
+18
-16
sky/shell/BUILD.gn
sky/shell/BUILD.gn
+2
-7
sky/tools/gn
sky/tools/gn
+16
-9
未找到文件。
sky/shell/BUILD.gn
浏览文件 @
6974f779
...
@@ -45,17 +45,12 @@ source_set("common") {
...
@@ -45,17 +45,12 @@ source_set("common") {
"$target_gen_dir/sky_embedder_diagnostic_server_resources.cc",
"$target_gen_dir/sky_embedder_diagnostic_server_resources.cc",
]
]
if (is_ios && !use_ios_simulator) {
public_deps = [
dart_deps = [ "//dart/runtime:libdart_precompiled_runtime" ]
} else {
dart_deps = [ "//dart/runtime:libdart" ]
}
public_deps = dart_deps + [
":generate_sky_embedder_diagnostic_server_resources_cc",
":generate_sky_embedder_diagnostic_server_resources_cc",
"//base",
"//base",
"//base:i18n",
"//base:i18n",
"//build/config/sanitizers:deps",
"//build/config/sanitizers:deps",
"//dart/runtime:libdart",
"//flow",
"//flow",
"//mojo/common",
"//mojo/common",
"//mojo/data_pipe_utils",
"//mojo/data_pipe_utils",
...
...
sky/tools/gn
浏览文件 @
6974f779
...
@@ -49,12 +49,6 @@ def to_gn_args(args):
...
@@ -49,12 +49,6 @@ def to_gn_args(args):
gn_args
[
'is_debug'
]
=
args
.
debug
gn_args
[
'is_debug'
]
=
args
.
debug
gn_args
[
'is_clang'
]
=
args
.
clang
and
args
.
target_os
not
in
[
'android'
,
'fnl'
]
gn_args
[
'is_clang'
]
=
args
.
clang
and
args
.
target_os
not
in
[
'android'
,
'fnl'
]
if
args
.
develop
:
gn_args
[
'dart_runtime_mode'
]
=
'develop'
elif
args
.
debug
:
gn_args
[
'dart_runtime_mode'
]
=
'profile'
else
:
gn_args
[
'dart_runtime_mode'
]
=
'release'
ios_target_cpu
=
'arm64'
ios_target_cpu
=
'arm64'
if
args
.
ios_force_armv7
:
if
args
.
ios_force_armv7
:
...
@@ -63,22 +57,27 @@ def to_gn_args(args):
...
@@ -63,22 +57,27 @@ def to_gn_args(args):
if
args
.
target_os
==
'android'
:
if
args
.
target_os
==
'android'
:
gn_args
[
'target_os'
]
=
'android'
gn_args
[
'target_os'
]
=
'android'
aot
=
not
args
.
develop
elif
args
.
target_os
==
'ios'
:
elif
args
.
target_os
==
'ios'
:
gn_args
[
'target_os'
]
=
'ios'
gn_args
[
'target_os'
]
=
'ios'
gn_args
[
'ios_deployment_target'
]
=
'7.0'
gn_args
[
'ios_deployment_target'
]
=
'7.0'
gn_args
[
'use_ios_simulator'
]
=
args
.
simulator
gn_args
[
'use_ios_simulator'
]
=
args
.
simulator
if
args
.
simulator
:
if
args
.
simulator
:
gn_args
[
'use_libjpeg_turbo'
]
=
False
gn_args
[
'use_libjpeg_turbo'
]
=
False
aot
=
False
else
:
else
:
# The iOS simulator snapshot is host targetted
# The iOS simulator snapshot is host targetted
gn_args
[
'dart_target_arch'
]
=
ios_target_cpu
gn_args
[
'dart_target_arch'
]
=
ios_target_cpu
aot
=
True
elif
args
.
target_os
==
'fnl'
:
elif
args
.
target_os
==
'fnl'
:
gn_args
[
'target_os'
]
=
'fnl'
gn_args
[
'target_os'
]
=
'fnl'
gn_args
[
'use_aura'
]
=
False
gn_args
[
'use_aura'
]
=
False
gn_args
[
'use_ozone'
]
=
True
gn_args
[
'use_ozone'
]
=
True
aot
=
False
else
:
else
:
gn_args
[
'use_aura'
]
=
False
gn_args
[
'use_aura'
]
=
False
gn_args
[
'use_system_harfbuzz'
]
=
False
gn_args
[
'use_system_harfbuzz'
]
=
False
aot
=
False
if
args
.
target_os
in
[
'android'
,
'ios'
]
and
not
args
.
simulator
:
if
args
.
target_os
in
[
'android'
,
'ios'
]
and
not
args
.
simulator
:
if
args
.
target_os
==
'ios'
:
if
args
.
target_os
==
'ios'
:
...
@@ -91,6 +90,14 @@ def to_gn_args(args):
...
@@ -91,6 +90,14 @@ def to_gn_args(args):
else
:
else
:
gn_args
[
'target_cpu'
]
=
'x64'
gn_args
[
'target_cpu'
]
=
'x64'
if
aot
:
if
args
.
debug
:
gn_args
[
'dart_runtime_mode'
]
=
'profile'
else
:
gn_args
[
'dart_runtime_mode'
]
=
'release'
else
:
gn_args
[
'dart_runtime_mode'
]
=
'develop'
if
args
.
target_sysroot
:
if
args
.
target_sysroot
:
gn_args
[
'target_sysroot'
]
=
args
.
target_sysroot
gn_args
[
'target_sysroot'
]
=
args
.
target_sysroot
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录