Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_34031325
engine
提交
7480e328
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,发现更多精彩内容 >>
提交
7480e328
编写于
7月 17, 2017
作者:
R
Ryan Macnak
提交者:
GitHub
7月 17, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove word-size mismatch from 32-bit Android debug builds to work wi… (#3879)
Roll Dart to be95b916ddf0af2b204286a438e7169e3bb2c67a.
上级
0a99358d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
13 deletion
+15
-13
DEPS
DEPS
+1
-1
tools/gn
tools/gn
+13
-10
travis/licenses_golden/licenses_dart
travis/licenses_golden/licenses_dart
+1
-2
未找到文件。
DEPS
浏览文件 @
7480e328
...
...
@@ -30,7 +30,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
# You can use //tools/dart/create_updated_fluter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': '
1bfd01c1f7a57fed039ce8ab95df2a5f14cf63b6
',
'dart_revision': '
be95b916ddf0af2b204286a438e7169e3bb2c67a
',
'dart_args_tag': '0.13.7',
'dart_async_tag': 'daf66909019d2aaec1721fc39d94ea648a9fdc1d',
...
...
tools/gn
浏览文件 @
7480e328
...
...
@@ -94,10 +94,9 @@ def to_gn_args(args):
gn_args
[
'target_cpu'
]
=
'x64'
else
:
gn_args
[
'target_cpu'
]
=
'arm64'
gn_args
[
'flutter_aot'
]
=
aot
if
aot
:
gn_args
[
'dart_target_arch'
]
=
gn_args
[
'target_cpu'
]
else
:
# Building host artifacts
gn_args
[
'target_cpu'
]
=
'x64'
# No cross-compilation on Windows (for now).
if
sys
.
platform
.
startswith
((
'cygwin'
,
'win'
)):
...
...
@@ -114,20 +113,24 @@ def to_gn_args(args):
gn_args
[
'dart_target_arch'
]
=
'dbc'
# Modify host_toolchain into dart_host_toolchain so it matches word size of target_cpu
if
args
.
target_os
==
'android'
and
aot
and
gn_args
[
'target_cpu'
]
==
'arm'
:
target_is_32_bit
=
gn_args
[
'target_cpu'
]
==
'arm'
or
gn_args
[
'target_cpu'
]
==
'x86'
if
target_is_32_bit
:
if
sys
.
platform
.
startswith
(
'linux'
):
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"
elif
args
.
target_os
==
"ios"
and
not
args
.
simulator
:
if
gn_args
[
'target_cpu'
]
==
'arm'
:
gn_args
[
'dart_host_toolchain'
]
=
'//build/toolchain/mac:clang_i386'
elif
gn_args
[
'target_cpu'
]
==
'arm64'
:
gn_args
[
'dart_host_toolchain'
]
=
'//build/toolchain/mac:clang_x64'
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_aot'
]
=
aot
if
args
.
target_sysroot
:
gn_args
[
'target_sysroot'
]
=
args
.
target_sysroot
...
...
travis/licenses_golden/licenses_dart
浏览文件 @
7480e328
Signature:
8f6268ccc2b376c8399cd9acc27b4e1c
Signature:
b30e56ad696f2fcb5da1a00579e68a5b
UNUSED LICENSES:
...
...
@@ -1203,7 +1203,6 @@ FILE: ../../../dart/client/idea/.idea/.name
FILE: ../../../dart/client/idea/.idea/inspectionProfiles/Project_Default.xml
FILE: ../../../dart/client/idea/.idea/vcs.xml
FILE: ../../../dart/runtime/CPPLINT.cfg
FILE: ../../../dart/runtime/bin/vmservice_sdk/lib/libraries.json
FILE: ../../../dart/runtime/bin/vmserviceio_dartium.dart
FILE: ../../../dart/runtime/observatory/.analysis_options
FILE: ../../../dart/runtime/observatory/.packages
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录