Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
#
Expand Down Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: dd3f14467338211a5281510f79cfd417
Signature: ab340e8a5209fd5df1280660cafa4ccd

UNUSED LICENSES:

Expand Down
5 changes: 1 addition & 4 deletions tools/gn
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down