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

Revert "Roll clang and buildroot" #33311

Merged
merged 1 commit into from
May 13, 2022
Merged

Revert "Roll clang and buildroot" #33311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '897fdb3e87b252f03915e20ba276302d8f029632',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '63f03c89282242d3f2938e0cc17038f35276c1e8',

# Fuchsia compatibility
#
Expand Down Expand Up @@ -579,7 +579,7 @@ deps = {
'packages': [
{
'package': 'fuchsia/third_party/clang/mac-amd64',
'version': 'pjqtsy0EkprqQK20GImo0tXIwVJ5oygbAPUHOqmGRlwC'
'version': 'gi-ivU51hLEmgL3m_giEo-uJOhzJgdYslQ0dvUvAJxcC'
}
],
'condition': 'host_os == "mac"',
Expand All @@ -590,7 +590,7 @@ deps = {
'packages': [
{
'package': 'fuchsia/third_party/clang/linux-amd64',
'version': 'xuUT1-3_9KoN3I7wncLinqPEYOMfQ16o53bxWJp0lIkC'
'version': 'Fn7lDYhKDAwbGQ2SOL_Anwt8fzO1Yho7UjpoS9Hv8N8C'
}
],
'condition': 'host_os == "linux"',
Expand All @@ -601,7 +601,7 @@ deps = {
'packages': [
{
'package': 'fuchsia/third_party/clang/windows-amd64',
'version': 'X7Z_tBCdyVsbPRX99U7jBZnMfJ5RS11wocVcia798jwC'
'version': '25xTI5-MiVJ87YWFvdlrwmn4O0DVDz-j3oHlszZAyoQC'
}
],
'condition': 'download_windows_deps',
Expand Down
12 changes: 6 additions & 6 deletions shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponderTest.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ - (void)testBasicKeyEvent API_AVAILABLE(ios(13.4)) {
}];

XCTAssertEqual([messages count], 1u);
XCTAssertStrEqual([messages lastObject][@"keymap"], @"ios");
XCTAssertStrEqual([messages lastObject][@"type"], @"keydown");
XCTAssertEqual([messages lastObject][@"keymap"], @"ios");
XCTAssertEqual([messages lastObject][@"type"], @"keydown");
XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], keyACode);
XCTAssertEqual([[messages lastObject][@"modifiers"] intValue], 0x0);
XCTAssertStrEqual([messages lastObject][@"characters"], @"a");
Expand All @@ -95,8 +95,8 @@ - (void)testBasicKeyEvent API_AVAILABLE(ios(13.4)) {
}];

XCTAssertEqual([messages count], 1u);
XCTAssertStrEqual([messages lastObject][@"keymap"], @"ios");
XCTAssertStrEqual([messages lastObject][@"type"], @"keyup");
XCTAssertEqual([messages lastObject][@"keymap"], @"ios");
XCTAssertEqual([messages lastObject][@"type"], @"keyup");
XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], keyACode);
XCTAssertEqual([[messages lastObject][@"modifiers"] intValue], 0x0);

Expand Down Expand Up @@ -132,8 +132,8 @@ - (void)testEmptyResponseIsTakenAsHandled API_AVAILABLE(ios(13.4)) {
}];

XCTAssertEqual([messages count], 1u);
XCTAssertStrEqual([messages lastObject][@"keymap"], @"ios");
XCTAssertStrEqual([messages lastObject][@"type"], @"keydown");
XCTAssertEqual([messages lastObject][@"keymap"], @"ios");
XCTAssertEqual([messages lastObject][@"type"], @"keydown");
XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], keyACode);
XCTAssertEqual([[messages lastObject][@"modifiers"] intValue], 0x0);
XCTAssertStrEqual([messages lastObject][@"characters"], @"a");
Expand Down
4 changes: 2 additions & 2 deletions shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderUnittests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@
EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keydown");
EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 0);
EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0);
EXPECT_STREQ([[messages lastObject][@"characters"] UTF8String], "a");
EXPECT_STREQ([[messages lastObject][@"charactersIgnoringModifiers"] UTF8String], "a");
EXPECT_EQ([[messages lastObject][@"characters"] UTF8String], "a");
EXPECT_EQ([[messages lastObject][@"charactersIgnoringModifiers"] UTF8String], "a");

EXPECT_EQ([responses count], 1u);
EXPECT_EQ([[responses lastObject] boolValue], TRUE);
Expand Down
2 changes: 1 addition & 1 deletion tools/gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ def to_gn_args(args):

if gn_args['target_os'] == 'ios':
gn_args['use_ios_simulator'] = args.simulator
else:
elif gn_args['target_os'] == 'mac':
gn_args['use_ios_simulator'] = False

if args.dart_debug:
Expand Down