DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Reland: Roll clang and buildroot (#33325)" (flutter/engine#33337)

Browse Source 
This reverts commit ca0e980e45b222e3e4534abe4c4e87631bf329ac.
This commit is contained in:
Zachary Anderson 2022-05-13 19:28:06 -07:00 committed by GitHub
parent ca0e980e45
commit b2e44faca7
7 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DEPS
View File

@ -111,7 +111,7 @@ allowed_hosts = [
]
deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '897fdb3e87b252f03915e20ba276302d8f029632',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '63f03c89282242d3f2938e0cc17038f35276c1e8',
# Fuchsia compatibility
#
@ -566,7 +566,7 @@ deps = {
'packages': [
{
'package': 'fuchsia/third_party/clang/mac-amd64',
'version': 'pjqtsy0EkprqQK20GImo0tXIwVJ5oygbAPUHOqmGRlwC'
'version': 'gi-ivU51hLEmgL3m_giEo-uJOhzJgdYslQ0dvUvAJxcC'
}
],
'condition': 'host_os == "mac"',
@ -577,7 +577,7 @@ deps = {
'packages': [
{
'package': 'fuchsia/third_party/clang/linux-amd64',
'version': 'xuUT1-3_9KoN3I7wncLinqPEYOMfQ16o53bxWJp0lIkC'
'version': 'Fn7lDYhKDAwbGQ2SOL_Anwt8fzO1Yho7UjpoS9Hv8N8C'
}
],
'condition': 'host_os == "linux"',
@ -588,7 +588,7 @@ deps = {
'packages': [
{
'package': 'fuchsia/third_party/clang/windows-amd64',
'version': 'X7Z_tBCdyVsbPRX99U7jBZnMfJ5RS11wocVcia798jwC'
'version': '25xTI5-MiVJ87YWFvdlrwmn4O0DVDz-j3oHlszZAyoQC'
}
],
'condition': 'download_windows_deps',

13
engine/src/flutter/BUILD.gn
View File

@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/toolchain/clang.gni")
import("//flutter/common/config.gni")
import("//flutter/examples/examples.gni")
import("//flutter/shell/platform/config.gni")
@ -26,21 +25,9 @@ config("config") {
}
config("export_dynamic_symbols") {
# --dynamic-list is the GNU linker syntax supported by ELF linkers.
# -exported_symbols_list is the macOS linker syntax. The different flags
# accept files formatted differently, so we have exported_symbols.sym for GNU
# linker syntax, and exported_symbols_mac.sym for the macOS linker syntax.
if (is_linux || is_fuchsia) {
inputs = [ "//flutter/common/exported_symbols.sym" ]
ldflags = [ "-Wl,--dynamic-list=" + rebase_path(inputs[0], root_build_dir) ]
} else if (is_mac && !use_xcode && flutter_runtime_mode == "debug") {
inputs = [ "//flutter/common/exported_symbols_mac.sym" ]
ldflags = [
"-Xlinker",
"-exported_symbols_list",
"-Xlinker",
rebase_path(inputs[0], root_build_dir),
]
}
}

1
engine/src/flutter/ci/licenses_golden/licenses_flutter
View File

@ -24,7 +24,6 @@ FILE: ../../../flutter/benchmarking/library.cc
FILE: ../../../flutter/benchmarking/library.h
FILE: ../../../flutter/common/constants.h
FILE: ../../../flutter/common/exported_symbols.sym
FILE: ../../../flutter/common/exported_symbols_mac.sym
FILE: ../../../flutter/common/graphics/gl_context_switch.cc
FILE: ../../../flutter/common/graphics/gl_context_switch.h
FILE: ../../../flutter/common/graphics/persistent_cache.cc

6
engine/src/flutter/common/exported_symbols_mac.sym
View File

@ -1,6 +0,0 @@
# These symbols are looked up from within the executable at runtime and must
# be exported in the dynamic symbol table.
_kDartVmSnapshotData
_kDartVmSnapshotInstructions
_kDartIsolateSnapshotData
_kDartIsolateSnapshotInstructions

12
engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponderTest.mm
View File

@ -74,8 +74,8 @@ 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");
@ -95,8 +95,8 @@ 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);
@ -132,8 +132,8 @@ 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");

4
engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderUnittests.mm
View File

@ -232,8 +232,8 @@ TEST(FlutterChannelKeyResponderUnittests, EmptyResponseIsTakenAsHandled) {
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);

2
engine/src/flutter/tools/gn
View File

@ -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: