Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 6f8e626

Browse files
chaselattachaselatta
committed
bump fuchsia toolchain to clang-12
1 parent 827aa5d commit 6f8e626

File tree

5 files changed

+55
-38
lines changed

5 files changed

+55
-38
lines changed

‎DEPS

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ deps = {
371371
Var('chromium_git') + '/webm/libwebp.git' + '@' + '0.6.0',
372372

373373
'src/third_party/wuffs':
374-
Var('skia_git') + '/external/github.com/google/wuffs.git' + '@' + '00cc8a50aa0c86b6bcb37e9ece8fb100047cc17b',
374+
Var('skia_git') + '/external/github.com/google/wuffs.git' + '@' + 'abedb38844d52dfcafa441ada5f8b76ace9fd47d',
375375

376376
'src/third_party/fontconfig/src':
377377
Var('chromium_git') + '/external/fontconfig.git' + '@' + 'c336b8471877371f0190ba06f7547c54e2b890ba',
@@ -535,16 +535,6 @@ deps = {
535535
'condition': 'host_os == "mac"',
536536
'dep_type': 'cipd',
537537
},
538-
'src/fuchsia/toolchain/mac': {
539-
'packages': [
540-
{
541-
'package': 'fuchsia/clang/mac-amd64',
542-
'version': 'OzTZOKkICT0yD82Dbx0jvVn5hN5eOSi6ByVTDseE7i0C'
543-
}
544-
],
545-
'condition': 'host_os == "mac"',
546-
'dep_type': 'cipd',
547-
},
548538
'src/fuchsia/sdk/linux': {
549539
'packages': [
550540
{
@@ -555,16 +545,16 @@ deps = {
555545
'condition': 'host_os == "linux"',
556546
'dep_type': 'cipd',
557547
},
558-
'src/fuchsia/toolchain/linux': {
548+
'src/fuchsia/toolchain/{host_os}': {
559549
'packages': [
560550
{
561-
'package': 'fuchsia/clang/linux-amd64',
562-
'version': 'OT6p30bQQhyCzRSy7xPsSbZ88J3PWOnneenkMZ0j7kIC'
551+
'package': 'fuchsia/third_party/clang/${{platform}}',
552+
'version': 'git_revision:2c0536b76b35fa592ac7b4a0e4bb176eaf55af75'
563553
}
564-
],
565-
'condition': 'host_os == "linux"',
566-
'dep_type': 'cipd',
567-
},
554+
],
555+
'condition': 'host_os == "mac" or host_os == "linux"',
556+
'dep_type': 'cipd',
557+
},
568558
}
569559

570560
hooks = [

‎ci/licenses_golden/licenses_third_party

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 9a56b96c19110590c7bffa9e23041917
1+
Signature: a08d2298d4222e59678ea67ed55758b1
22

33
UNUSED LICENSES:
44

@@ -1069,39 +1069,50 @@ FILE: ../../../third_party/wuffs/cmd/wuffs/main.go
10691069
FILE: ../../../third_party/wuffs/cmd/wuffs/release.go
10701070
FILE: ../../../third_party/wuffs/cmd/wuffs/test.go
10711071
FILE: ../../../third_party/wuffs/cmd/wuffsfmt/main.go
1072+
FILE: ../../../third_party/wuffs/example/cbor-to-json/cbor-to-json.cc
10721073
FILE: ../../../third_party/wuffs/example/convert-to-nia/convert-to-nia.c
10731074
FILE: ../../../third_party/wuffs/example/crc32/crc32.cc
10741075
FILE: ../../../third_party/wuffs/example/gifplayer/gifplayer.c
10751076
FILE: ../../../third_party/wuffs/example/imageviewer/imageviewer.c
1077+
FILE: ../../../third_party/wuffs/example/json-to-cbor/json-to-cbor.cc
10761078
FILE: ../../../third_party/wuffs/example/jsonfindptrs/jsonfindptrs.cc
10771079
FILE: ../../../third_party/wuffs/example/jsonptr/jsonptr.cc
1078-
FILE: ../../../third_party/wuffs/example/library/library.c
1080+
FILE: ../../../third_party/wuffs/example/toy-genlib/toy-genlib.c
10791081
FILE: ../../../third_party/wuffs/example/zcat/zcat.c
10801082
FILE: ../../../third_party/wuffs/fuzz/c/fuzzlib/fuzzlib.c
1083+
FILE: ../../../third_party/wuffs/fuzz/c/std/cbor_fuzzer.c
10811084
FILE: ../../../third_party/wuffs/fuzz/c/std/gif_fuzzer.c
10821085
FILE: ../../../third_party/wuffs/fuzz/c/std/json_fuzzer.c
10831086
FILE: ../../../third_party/wuffs/fuzz/c/std/zlib_fuzzer.c
10841087
FILE: ../../../third_party/wuffs/hello-wuffs-c/main.c
10851088
FILE: ../../../third_party/wuffs/hello-wuffs-c/parse.wuffs
10861089
FILE: ../../../third_party/wuffs/hello-wuffs-c/wuffs-base.c
1090+
FILE: ../../../third_party/wuffs/internal/cgen/auxiliary/base.cc
1091+
FILE: ../../../third_party/wuffs/internal/cgen/auxiliary/base.hh
1092+
FILE: ../../../third_party/wuffs/internal/cgen/auxiliary/cbor.cc
1093+
FILE: ../../../third_party/wuffs/internal/cgen/auxiliary/cbor.hh
1094+
FILE: ../../../third_party/wuffs/internal/cgen/auxiliary/json.cc
1095+
FILE: ../../../third_party/wuffs/internal/cgen/auxiliary/json.hh
10871096
FILE: ../../../third_party/wuffs/internal/cgen/base/all-impl.c
1088-
FILE: ../../../third_party/wuffs/internal/cgen/base/f64conv-submodule.c
1097+
FILE: ../../../third_party/wuffs/internal/cgen/base/floatconv-submodule-code.c
1098+
FILE: ../../../third_party/wuffs/internal/cgen/base/floatconv-submodule-data.c
10891099
FILE: ../../../third_party/wuffs/internal/cgen/base/fundamental-private.h
10901100
FILE: ../../../third_party/wuffs/internal/cgen/base/fundamental-public.h
10911101
FILE: ../../../third_party/wuffs/internal/cgen/base/image-private.h
10921102
FILE: ../../../third_party/wuffs/internal/cgen/base/image-public.h
1103+
FILE: ../../../third_party/wuffs/internal/cgen/base/intconv-submodule.c
10931104
FILE: ../../../third_party/wuffs/internal/cgen/base/io-private.h
10941105
FILE: ../../../third_party/wuffs/internal/cgen/base/io-public.h
10951106
FILE: ../../../third_party/wuffs/internal/cgen/base/memory-private.h
10961107
FILE: ../../../third_party/wuffs/internal/cgen/base/memory-public.h
10971108
FILE: ../../../third_party/wuffs/internal/cgen/base/pixconv-submodule.c
10981109
FILE: ../../../third_party/wuffs/internal/cgen/base/range-private.h
10991110
FILE: ../../../third_party/wuffs/internal/cgen/base/range-public.h
1100-
FILE: ../../../third_party/wuffs/internal/cgen/base/strconv-impl.c
11011111
FILE: ../../../third_party/wuffs/internal/cgen/base/strconv-private.h
11021112
FILE: ../../../third_party/wuffs/internal/cgen/base/strconv-public.h
11031113
FILE: ../../../third_party/wuffs/internal/cgen/base/token-private.h
11041114
FILE: ../../../third_party/wuffs/internal/cgen/base/token-public.h
1115+
FILE: ../../../third_party/wuffs/internal/cgen/base/utf8-submodule.c
11051116
FILE: ../../../third_party/wuffs/internal/cgen/builtin.go
11061117
FILE: ../../../third_party/wuffs/internal/cgen/cgen.go
11071118
FILE: ../../../third_party/wuffs/internal/cgen/data/data.go
@@ -1192,11 +1203,13 @@ FILE: ../../../third_party/wuffs/script/compress-giflzw.go
11921203
FILE: ../../../third_party/wuffs/script/convert-png-to-wbmp.go
11931204
FILE: ../../../third_party/wuffs/script/crawl.go
11941205
FILE: ../../../third_party/wuffs/script/draw-with-mask.go
1206+
FILE: ../../../third_party/wuffs/script/extract-cbor-rfc-7049-examples.go
11951207
FILE: ../../../third_party/wuffs/script/extract-deflate-offsets.go
11961208
FILE: ../../../third_party/wuffs/script/extract-giflzw.go
11971209
FILE: ../../../third_party/wuffs/script/extract-palette-indexes.go
11981210
FILE: ../../../third_party/wuffs/script/inline-c-relative-includes.go
11991211
FILE: ../../../third_party/wuffs/script/make-artificial.go
1212+
FILE: ../../../third_party/wuffs/script/manual-test-parse-number-f64.cc
12001213
FILE: ../../../third_party/wuffs/script/mmap-ring-buffer.c
12011214
FILE: ../../../third_party/wuffs/script/preprocess-wuffs.go
12021215
FILE: ../../../third_party/wuffs/script/print-bits.go
@@ -1207,14 +1220,18 @@ FILE: ../../../third_party/wuffs/script/print-deflate-huff-table-size.go
12071220
FILE: ../../../third_party/wuffs/script/print-deflate-magic-numbers.go
12081221
FILE: ../../../third_party/wuffs/script/print-file-sizes-json.go
12091222
FILE: ../../../third_party/wuffs/script/print-hpd-left-shift.go
1223+
FILE: ../../../third_party/wuffs/script/print-json-ascii-escapes.go
12101224
FILE: ../../../third_party/wuffs/script/print-json-token-debug-format.c
12111225
FILE: ../../../third_party/wuffs/script/print-lzw-example.go
12121226
FILE: ../../../third_party/wuffs/script/print-markdown-links.go
12131227
FILE: ../../../third_party/wuffs/script/print-mpb-powers-of-10.go
1228+
FILE: ../../../third_party/wuffs/script/print-render-number-f64-tests.go
1229+
FILE: ../../../third_party/wuffs/script/process-json-numbers.c
12141230
FILE: ../../../third_party/wuffs/script/rac-random-seek-test.go
12151231
FILE: ../../../third_party/wuffs/script/wuffs-deflate-decoder-decode-huffman.c
12161232
FILE: ../../../third_party/wuffs/std/adler32/common_adler32.wuffs
12171233
FILE: ../../../third_party/wuffs/std/bmp/decode_bmp.wuffs
1234+
FILE: ../../../third_party/wuffs/std/cbor/decode_cbor.wuffs
12181235
FILE: ../../../third_party/wuffs/std/crc32/common_crc32.wuffs
12191236
FILE: ../../../third_party/wuffs/std/deflate/common_consts.wuffs
12201237
FILE: ../../../third_party/wuffs/std/deflate/decode_deflate.wuffs

‎tools/fuchsia/clang.gni

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ if (is_fuchsia) {
2626
assert(false, "OS not supported")
2727
}
2828

29-
clang_manifest = rebase_path("$clang_base/${clang_target}.manifest")
29+
clang_manifest = rebase_path("$clang_base/runtime.json")
3030
clang_manifest_json = exec_script("//flutter/tools/fuchsia/parse_manifest.py",
31-
[ "--input=${clang_manifest}" ],
31+
[
32+
"--input=${clang_manifest}",
33+
"--clang-cpu=${clang_cpu}",
34+
],
3235
"json")

‎tools/fuchsia/fuchsia_libs.gni

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ common_libs = [
4848
{
4949
name = "libc++.so.2"
5050
path = rebase_path(
51-
"$clang_base/${clang_manifest_json.md5_33bfe15b05ada4ed326fbc33adb39b95}")
51+
"$clang_base/${clang_manifest_json.md5_19df03aecdc9eb27bc8b4038352f2b27}")
5252
},
5353
{
5454
name = "libc++abi.so.1"
5555
path = rebase_path(
56-
"$clang_base/${clang_manifest_json.md5_916c01a85e3353f124776599819ecb1c}")
56+
"$clang_base/${clang_manifest_json.md5_6aff1b5f218d4a9278d85d63d0695af8}")
5757
},
5858
{
5959
name = "libunwind.so.1"
6060
path = rebase_path(
61-
"$clang_base/${clang_manifest_json.md5_beb70f40d525448b39ea87d9f5811e56}")
61+
"$clang_base/${clang_manifest_json.md5_fb2bd871885ef42c2cf3138655f901ed}")
6262
},
6363
]
6464

‎tools/fuchsia/parse_manifest.py

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,34 @@
1212
import sys
1313
import hashlib
1414

15-
1615
def main():
1716
parser = argparse.ArgumentParser()
1817

1918
parser.add_argument(
2019
'--input', dest='file_path', action='store', required=True)
20+
parser.add_argument(
21+
'--clang-cpu', dest='clang_cpu', action='store', required=True)
2122

2223
args = parser.parse_args()
2324

24-
files = open(args.file_path, 'r')
25-
lines = files.read().split()
25+
with open(args.file_path) as f:
26+
data = json.load(f)
2627

2728
output = {}
28-
29-
for line in lines:
30-
key, val = line.strip().split('=')
31-
md5 = hashlib.md5(key.encode()).hexdigest()
32-
hash_key = 'md5_%s' % md5
33-
# Uncomment this line to get the hash keys
34-
# print val, hash_key
35-
output[hash_key] = os.path.dirname(val)
29+
target = args.clang_cpu + '-fuchsia'
30+
31+
for d in data:
32+
if target in d['target']:
33+
for runtime in d['runtime']:
34+
# key contains the soname and the cflags used to compile it.
35+
# this allows us to distinguish between different sanitizers
36+
# and experiments
37+
key = runtime['soname'] + ''.join(d['cflags'])
38+
md5 = hashlib.md5(key.encode()).hexdigest()
39+
hash_key = 'md5_%s' % md5
40+
# Uncomment this line to get the hash keys
41+
# print runtime['dist'], d['cflags'], hash_key
42+
output[hash_key] = os.path.dirname(runtime['dist'])
3643

3744
print(json.dumps(output))
3845

0 commit comments

Comments
 (0)