From fdec1ceea7f71ad204077767c4ae861de0f2f90a Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 11 Jan 2021 16:53:19 -0800 Subject: [PATCH 1/6] .. --- DEPS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index ac4c3dedbf172..807b815972c59 100644 --- a/DEPS +++ b/DEPS @@ -368,7 +368,7 @@ deps = { Var('chromium_git') + '/webm/libwebp.git' + '@' + '0.6.0', 'src/third_party/wuffs': - Var('skia_git') + '/external/github.com/google/wuffs.git' + '@' + '00cc8a50aa0c86b6bcb37e9ece8fb100047cc17b', + Var('skia_git') + '/external/github.com/google/wuffs.git' + '@' + 'c86add25f790360f0aca026c4f1c2c4e2d12408d', 'src/third_party/fontconfig/src': Var('chromium_git') + '/external/fontconfig.git' + '@' + 'c336b8471877371f0190ba06f7547c54e2b890ba', @@ -399,7 +399,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/ndk/${{platform}}', - 'version': 'version:r21.0.6113669' + 'version': 'version:r22.0.7026061' } ], 'condition': 'download_android_deps', @@ -500,7 +500,7 @@ deps = { 'packages': [ { 'package': 'fuchsia/third_party/clang/${{platform}}', - 'version': 'git_revision:7e9747b50bcb1be28d4a3236571e8050835497a6' + 'version': 'git_revision:8af160b0b8ca8102b9490a287244af75727872f5' } ], 'condition': 'host_os == "mac" or host_os == "linux"', From 7eb63e37b0ced80326cc4213a26c147bf8ee208f Mon Sep 17 00:00:00 2001 From: Dan Field Date: Thu, 14 Jan 2021 13:33:41 -0800 Subject: [PATCH 2/6] .. --- DEPS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 807b815972c59..2870278889147 100644 --- a/DEPS +++ b/DEPS @@ -38,7 +38,7 @@ vars = { # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py - 'dart_boringssl_gen_rev': '429ccb1877f7987a6f3988228bc2440e61293499', + 'dart_boringssl_gen_rev': 'aaac86738c4f2d1bdf00f54d197f50f247ffee04', 'dart_boringssl_rev': '4dfd5af70191b068aebe567b8e29ce108cee85ce', 'dart_clock_rev': 'a494269254ba978e7ef8f192c5f7fec3fc05b9d3', 'dart_collection_rev': 'e4bb038ce2d8e66fb15818aa40685c68d53692ab', @@ -399,7 +399,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/ndk/${{platform}}', - 'version': 'version:r22.0.7026061' + 'version': 'version:r21.0.6113669' } ], 'condition': 'download_android_deps', From 0b47b2d9e6aeb1e369049ad54df3ae30473385eb Mon Sep 17 00:00:00 2001 From: Dan Field Date: Thu, 14 Jan 2021 13:35:10 -0800 Subject: [PATCH 3/6] Roll buildroot to 92a8d2eb7aad592068f808e39b8330fd2bce25e3 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 73f8856a6956c..3a50940b7d8e9 100644 --- a/DEPS +++ b/DEPS @@ -98,7 +98,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '9d2c731ba05432878cc5187329c66b70983d914b', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '92a8d2eb7aad592068f808e39b8330fd2bce25e3', # Fuchsia compatibility # From 94c092bccc064ba5e4703283cdddc9e203675169 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Thu, 14 Jan 2021 13:51:31 -0800 Subject: [PATCH 4/6] missing arg --- tools/gn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/gn b/tools/gn index 119dd067c945b..ec1bb45e76230 100755 --- a/tools/gn +++ b/tools/gn @@ -327,6 +327,10 @@ def to_gn_args(args): gn_args['dart_version_git_info'] = not args.no_dart_version_git_info + # Overrides whether Boring SSL is compiled with system as. Only meaningful + # on Android. + gn_args['bssl_use_clang_integrated_as'] = true + return gn_args def parse_args(args): From b56ecf6d5a53cb44744e87be988b44119fd27c64 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Thu, 14 Jan 2021 13:57:21 -0800 Subject: [PATCH 5/6] python... --- tools/gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gn b/tools/gn index ec1bb45e76230..9f0fd4d2b6db6 100755 --- a/tools/gn +++ b/tools/gn @@ -329,7 +329,7 @@ def to_gn_args(args): # Overrides whether Boring SSL is compiled with system as. Only meaningful # on Android. - gn_args['bssl_use_clang_integrated_as'] = true + gn_args['bssl_use_clang_integrated_as'] = True return gn_args From 7e398f8df8ccfb2d125837d2d12070c9852ebced Mon Sep 17 00:00:00 2001 From: Dan Field Date: Fri, 15 Jan 2021 14:04:00 -0800 Subject: [PATCH 6/6] try earlier version of 12.0.0 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 3a50940b7d8e9..5f9df4522483f 100644 --- a/DEPS +++ b/DEPS @@ -500,7 +500,7 @@ deps = { 'packages': [ { 'package': 'fuchsia/third_party/clang/${{platform}}', - 'version': 'git_revision:8af160b0b8ca8102b9490a287244af75727872f5' + 'version': 'git_revision:25abd1994ed209c1bf4139946a42e36a42143a85' } ], 'condition': 'host_os == "mac" or host_os == "linux"',