Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
0419f1d4
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,发现更多精彩内容 >>
未验证
提交
0419f1d4
编写于
1月 06, 2021
作者:
C
Chase Latta
提交者:
GitHub
1月 06, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "bump fuchsia toolchain to clang-12" (#23456)
上级
7668007b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
34 addition
and
34 deletion
+34
-34
DEPS
DEPS
+18
-8
tools/fuchsia/clang.gni
tools/fuchsia/clang.gni
+2
-5
tools/fuchsia/fuchsia_libs.gni
tools/fuchsia/fuchsia_libs.gni
+3
-3
tools/fuchsia/parse_manifest.py
tools/fuchsia/parse_manifest.py
+11
-18
未找到文件。
DEPS
浏览文件 @
0419f1d4
...
...
@@ -98,7 +98,7 @@ allowed_hosts = [
]
deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '
c80bb183b30b3df12a3d8a6db235c0171c10d6a0
',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '
3d37855508a4de2481ad0fead8e15563f0210c2c
',
# Fuchsia compatibility
#
...
...
@@ -532,6 +532,16 @@ deps = {
'condition': 'host_os == "mac"',
'dep_type': 'cipd',
},
'src/fuchsia/toolchain/mac': {
'packages': [
{
'package': 'fuchsia/clang/mac-amd64',
'version': 'OzTZOKkICT0yD82Dbx0jvVn5hN5eOSi6ByVTDseE7i0C'
}
],
'condition': 'host_os == "mac"',
'dep_type': 'cipd',
},
'src/fuchsia/sdk/linux': {
'packages': [
{
...
...
@@ -542,16 +552,16 @@ deps = {
'condition': 'host_os == "linux"',
'dep_type': 'cipd',
},
'src/fuchsia/toolchain/
{host_os}
': {
'src/fuchsia/toolchain/
linux
': {
'packages': [
{
'package': 'fuchsia/third_party/clang/${{platform}}
',
'version': 'git_revision:3aa8e071dd1ae7e9fb9e28fa9fcdb9f9fdb7aa06
'
'package': 'fuchsia/clang/linux-amd64
',
'version': 'OT6p30bQQhyCzRSy7xPsSbZ88J3PWOnneenkMZ0j7kIC
'
}
],
'condition': 'host_os == "mac" or
host_os == "linux"',
'dep_type': 'cipd',
},
],
'condition': '
host_os == "linux"',
'dep_type': 'cipd',
},
}
hooks = [
...
...
tools/fuchsia/clang.gni
浏览文件 @
0419f1d4
...
...
@@ -26,10 +26,7 @@ if (is_fuchsia) {
assert(false, "OS not supported")
}
clang_manifest = rebase_path("$clang_base/
runtime.json
")
clang_manifest = rebase_path("$clang_base/
${clang_target}.manifest
")
clang_manifest_json = exec_script("//flutter/tools/fuchsia/parse_manifest.py",
[
"--input=${clang_manifest}",
"--clang-cpu=${clang_cpu}",
],
[ "--input=${clang_manifest}" ],
"json")
tools/fuchsia/fuchsia_libs.gni
浏览文件 @
0419f1d4
...
...
@@ -48,17 +48,17 @@ common_libs = [
{
name = "libc++.so.2"
path = rebase_path(
"$clang_base/${clang_manifest_json.md5_
19df03aecdc9eb27bc8b4038352f2b27
}")
"$clang_base/${clang_manifest_json.md5_
33bfe15b05ada4ed326fbc33adb39b95
}")
},
{
name = "libc++abi.so.1"
path = rebase_path(
"$clang_base/${clang_manifest_json.md5_
6aff1b5f218d4a9278d85d63d0695af8
}")
"$clang_base/${clang_manifest_json.md5_
916c01a85e3353f124776599819ecb1c
}")
},
{
name = "libunwind.so.1"
path = rebase_path(
"$clang_base/${clang_manifest_json.md5_
fb2bd871885ef42c2cf3138655f901ed
}")
"$clang_base/${clang_manifest_json.md5_
beb70f40d525448b39ea87d9f5811e56
}")
},
]
...
...
tools/fuchsia/parse_manifest.py
浏览文件 @
0419f1d4
...
...
@@ -12,34 +12,27 @@ import os
import
sys
import
hashlib
def
main
():
parser
=
argparse
.
ArgumentParser
()
parser
.
add_argument
(
'--input'
,
dest
=
'file_path'
,
action
=
'store'
,
required
=
True
)
parser
.
add_argument
(
'--clang-cpu'
,
dest
=
'clang_cpu'
,
action
=
'store'
,
required
=
True
)
args
=
parser
.
parse_args
()
with
open
(
args
.
file_path
)
as
f
:
data
=
json
.
load
(
f
)
files
=
open
(
args
.
file_path
,
'r'
)
lines
=
files
.
read
().
split
(
)
output
=
{}
target
=
args
.
clang_cpu
+
'-fuchsia'
for
d
in
data
:
if
target
in
d
[
'target'
]:
for
runtime
in
d
[
'runtime'
]:
# key contains the soname and the cflags used to compile it.
# this allows us to distinguish between different sanitizers
# and experiments
key
=
runtime
[
'soname'
]
+
''
.
join
(
d
[
'cflags'
])
md5
=
hashlib
.
md5
(
key
.
encode
()).
hexdigest
()
hash_key
=
'md5_%s'
%
md5
# Uncomment this line to get the hash keys
# print runtime['dist'], d['cflags'], hash_key
output
[
hash_key
]
=
os
.
path
.
dirname
(
runtime
[
'dist'
])
for
line
in
lines
:
key
,
val
=
line
.
strip
().
split
(
'='
)
md5
=
hashlib
.
md5
(
key
.
encode
()).
hexdigest
()
hash_key
=
'md5_%s'
%
md5
# Uncomment this line to get the hash keys
# print val, hash_key
output
[
hash_key
]
=
os
.
path
.
dirname
(
val
)
print
(
json
.
dumps
(
output
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录