DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "bump fuchsia toolchain to clang-12" (flutter/engine#23456)

Browse Source
This commit is contained in:
Chase Latta 2021-01-06 11:14:49 -08:00 committed by GitHub
parent 1de928a0c7
commit b203aaaa99
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
DEPS
View File

@ -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 = [

7
engine/src/flutter/tools/fuchsia/clang.gni
View File

@ -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")

6
engine/src/flutter/tools/fuchsia/fuchsia_libs.gni
View File

@ -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}")
},
]

27
engine/src/flutter/tools/fuchsia/parse_manifest.py
View File

@ -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))