diff --git a/DEPS b/DEPS index 42dd2c92d2f56..6a755a2d6bdf5 100644 --- a/DEPS +++ b/DEPS @@ -34,7 +34,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS. # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '40fd1c456e0a872ab8f6d2a018b3436d2f7a5f84', + 'dart_revision': '7e8348f4ce87f89235154e974c799de57473c4f4', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -107,7 +107,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '92f0936b9c4daec1af9296125d449807bdec9219', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'fe3b46e595e7ce1350e11aa0c90365976051f4a3', # Fuchsia compatibility # @@ -354,7 +354,7 @@ deps = { Var('dart_git') + '/package_config.git@9c586d04bd26fef01215fd10e7ab96a3050cfa64', 'src/third_party/dart/tools/sdks': - {'packages': [{'version': 'version:2.10.0-0.2-preview', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'}, + {'packages': [{'version': 'version:2.10.0-0.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'}, # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py. diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 62e72bff8d790..7183989ca5689 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: dd3f14467338211a5281510f79cfd417 +Signature: ab340e8a5209fd5df1280660cafa4ccd UNUSED LICENSES: diff --git a/tools/gn b/tools/gn index b906d41cc56a1..6ec42f64e934c 100755 --- a/tools/gn +++ b/tools/gn @@ -99,10 +99,7 @@ def to_gn_args(args): gn_args['is_debug'] = args.unoptimized gn_args['android_full_debug'] = args.target_os == 'android' and args.unoptimized if args.clang is None: - # Android gen_snapshot currently isn't buildable with clang on Windows. - # For everything else, default to clang. - gn_args['is_clang'] = not (sys.platform.startswith(('cygwin', 'win')) and - args.target_os == 'android') + gn_args['is_clang'] = True else: gn_args['is_clang'] = args.clang