Revert "Reland Clang 11, roll buildroot to 1bc40a5f916adb93d87e2a2230a0ec43db876c1c, take 3 (#17467)" (#17482)
This reverts commit 39b77188c5425925a72fe0a64d246dbc0b3cdadc.
diff --git a/DEPS b/DEPS
index b85ec31..583daa4 100644
--- a/DEPS
+++ b/DEPS
@@ -136,7 +136,7 @@
]
deps = {
- 'src': 'https://github.com/flutter/buildroot.git' + '@' + '1bc40a5f916adb93d87e2a2230a0ec43db876c1c',
+ 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a0fb98af7b6f50f17b47ab7968f3f5664d0d6316',
# Fuchsia compatibility
#
@@ -517,8 +517,8 @@
'src/buildtools/{host_os}-x64/clang': {
'packages': [
{
- 'package': 'fuchsia/third_party/clang/${{platform}}',
- 'version': 'git_revision:7e9747b50bcb1be28d4a3236571e8050835497a6'
+ 'package': 'fuchsia/clang/${{platform}}',
+ 'version': 'git_revision:de39621f0f03f20633bdfa50bde97a3908bf6e98'
}
],
'condition': 'host_os == "mac" or host_os == "linux"',
diff --git a/flow/layers/performance_overlay_layer_unittests.cc b/flow/layers/performance_overlay_layer_unittests.cc
index 3fcb2e0..cf0cd68 100644
--- a/flow/layers/performance_overlay_layer_unittests.cc
+++ b/flow/layers/performance_overlay_layer_unittests.cc
@@ -88,8 +88,6 @@
<< "Please either set --golden-dir, or make sure that the unit test is "
<< "run from the right directory (e.g., flutter/engine/src).";
- // TODO(https://github.com/flutter/flutter/issues/53784): enable this on all
- // platforms.
#if !defined(OS_LINUX)
GTEST_SKIP() << "Skipping golden tests on non-Linux OSes";
#endif // OS_LINUX
diff --git a/shell/platform/embedder/tests/embedder_unittests.cc b/shell/platform/embedder/tests/embedder_unittests.cc
index 78286fc..291d8cd 100644
--- a/shell/platform/embedder/tests/embedder_unittests.cc
+++ b/shell/platform/embedder/tests/embedder_unittests.cc
@@ -1430,7 +1430,7 @@
});
context.GetCompositor().SetPlatformViewRendererCallback(
- [&](const FlutterLayer& layer, GrContext*
+ [&](const FlutterLayer& layer, GrContext *
/* don't use because software compositor */) -> sk_sp<SkImage> {
auto surface = CreateRenderSurface(
layer, nullptr /* null because software compositor */);
@@ -3001,12 +3001,6 @@
auto renderered_scene = context.GetNextSceneImage();
latch.Wait();
-
- // TODO(https://github.com/flutter/flutter/issues/53784): enable this on all
- // platforms.
-#if !defined(OS_LINUX)
- GTEST_SKIP() << "Skipping golden tests on non-Linux OSes";
-#endif // OS_LINUX
ASSERT_TRUE(ImageMatchesFixture("verifyb143464703_soft_noxform.png",
renderered_scene));
}
diff --git a/sky/tools/create_ios_framework.py b/sky/tools/create_ios_framework.py
index 8c79921..bb74044 100755
--- a/sky/tools/create_ios_framework.py
+++ b/sky/tools/create_ios_framework.py
@@ -10,9 +10,6 @@
import os
-DSYMUTIL = os.path.join(os.path.dirname(__file__), '..', '..', '..',
- 'buildtools', 'mac-x64', 'clang', 'bin', 'dsymutil')
-
def main():
parser = argparse.ArgumentParser(description='Creates Flutter.framework')
@@ -36,31 +33,27 @@
simulator_dylib = os.path.join(simulator_framework, 'Flutter')
if not os.path.isdir(arm64_framework):
- print('Cannot find iOS arm64 Framework at %s' % arm64_framework)
+ print 'Cannot find iOS arm64 Framework at', arm64_framework
return 1
if not os.path.isdir(armv7_framework):
- print('Cannot find iOS armv7 Framework at %s' % armv7_framework)
+ print 'Cannot find iOS armv7 Framework at', armv7_framework
return 1
if not os.path.isdir(simulator_framework):
- print('Cannot find iOS simulator Framework at %s' % simulator_framework)
+ print 'Cannot find iOS simulator Framework at', simulator_framework
return 1
if not os.path.isfile(arm64_dylib):
- print('Cannot find iOS arm64 dylib at %s' % arm64_dylib)
+ print 'Cannot find iOS arm64 dylib at', arm64_dylib
return 1
if not os.path.isfile(armv7_dylib):
- print('Cannot find iOS armv7 dylib at %s' % armv7_dylib)
+ print 'Cannot find iOS armv7 dylib at', armv7_dylib
return 1
if not os.path.isfile(simulator_dylib):
- print('Cannot find iOS simulator dylib at %s' % simulator_dylib)
- return 1
-
- if not os.path.isfile(DSYMUTIL):
- print('Cannot find dsymutil at %s' % DSYMUTIL)
+ print 'Cannot find iOS simulator dylib at', simulator_dylib
return 1
shutil.rmtree(fat_framework, True)
@@ -83,7 +76,7 @@
if args.dsym:
dsym_out = os.path.splitext(fat_framework)[0] + '.dSYM'
- subprocess.check_call([DSYMUTIL, '-o', dsym_out, linker_out])
+ subprocess.check_call(['dsymutil', '-o', dsym_out, linker_out])
if args.strip:
# copy unstripped
diff --git a/testing/dart/canvas_test.dart b/testing/dart/canvas_test.dart
index 25d1ed0..85fbe37 100644
--- a/testing/dart/canvas_test.dart
+++ b/testing/dart/canvas_test.dart
@@ -181,7 +181,7 @@
final bool areEqual =
await fuzzyGoldenImageCompare(image, 'canvas_test_gradient.png');
expect(areEqual, true);
- }, skip: !Platform.isLinux); // https://github.com/flutter/flutter/issues/53784
+ });
test('Simple dithered gradient', () async {
Paint.enableDithering = true;
@@ -197,5 +197,5 @@
final bool areEqual =
await fuzzyGoldenImageCompare(image, 'canvas_test_dithered_gradient.png');
expect(areEqual, true);
- }, skip: !Platform.isLinux); // https://github.com/flutter/flutter/issues/53784
+ });
}
diff --git a/testing/symbols/verify_exported.dart b/testing/symbols/verify_exported.dart
index 2bd2d23..2b822d0 100644
--- a/testing/symbols/verify_exported.dart
+++ b/testing/symbols/verify_exported.dart
@@ -110,93 +110,8 @@
'JNI_OnLoad': 'T',
'_binary_icudtl_dat_size': 'A',
'_binary_icudtl_dat_start': 'D',
- // TODO(fxb/47943): Remove these once Clang lld does not expose them.
- // arm
- '__adddf3': 'T',
- '__addsf3': 'T',
- '__aeabi_cdcmpeq': 'T',
- '__aeabi_cdcmple': 'T',
- '__aeabi_cdrcmple': 'T',
- '__aeabi_d2lz': 'T',
- '__aeabi_d2uiz': 'T',
- '__aeabi_d2ulz': 'T',
- '__aeabi_dadd': 'T',
- '__aeabi_dcmpeq': 'T',
- '__aeabi_dcmpge': 'T',
- '__aeabi_dcmpgt': 'T',
- '__aeabi_dcmple': 'T',
- '__aeabi_dcmplt': 'T',
- '__aeabi_ddiv': 'T',
- '__aeabi_dmul': 'T',
- '__aeabi_drsub': 'T',
- '__aeabi_dsub': 'T',
- '__aeabi_f2d': 'T',
- '__aeabi_fadd': 'T',
- '__aeabi_frsub': 'T',
- '__aeabi_fsub': 'T',
- '__aeabi_i2d': 'T',
- '__aeabi_i2f': 'T',
- '__aeabi_l2d': 'T',
- '__aeabi_l2f': 'T',
- '__aeabi_lasr': 'T',
- '__aeabi_ldivmod': 'T',
- '__aeabi_llsl': 'T',
- '__aeabi_llsr': 'T',
- '__aeabi_ui2d': 'T',
- '__aeabi_ui2f': 'T',
- '__aeabi_uidiv': 'T',
- '__aeabi_uidivmod': 'T',
- '__aeabi_ul2d': 'T',
- '__aeabi_ul2f': 'T',
- '__aeabi_uldivmod': 'T',
- '__ashldi3': 'T',
- '__ashrdi3': 'T',
- '__cmpdf2': 'T',
- '__divdf3': 'T',
- '__divdi3': 'T',
- '__eqdf2': 'T',
- '__extendsfdf2': 'T',
- '__fixdfdi': 'T',
- '__fixunsdfdi': 'T',
- '__fixunsdfsi': 'T',
- '__floatdidf': 'T',
- '__floatdisf': 'T',
- '__floatsidf': 'T',
- '__floatsisf': 'T',
- '__floatundidf': 'T',
- '__floatundisf': 'T',
- '__floatunsidf': 'T',
- '__floatunsisf': 'T',
- '__gedf2': 'T',
- '__gnu_ldivmod_helper': 'T',
- '__gnu_uldivmod_helper': 'T',
- '__gtdf2': 'T',
- '__ledf2': 'T',
- '__lshrdi3': 'T',
- '__ltdf2': 'T',
- '__muldf3': 'T',
- '__nedf2': 'T',
- '__subdf3': 'T',
- '__subsf3': 'T',
- '__udivdi3': 'T',
- '__udivsi3': 'T',
- // arm64
- '__clz_tab': 'R',
- '__udivti3': 'T',
- // arm64 && x64
- '__emutls_get_address': 'T',
- '__emutls_register_common': 'T',
- // jit x86
- '__moddi3': 'T',
- '__umoddi3': 'T',
};
- final Map<String, String> badSymbols = <String, String>{};
- for (final String key in entryMap.keys) {
- if (entryMap[key] != expectedSymbols[key]) {
- badSymbols[key] = entryMap[key];
- }
- }
- if (badSymbols.isNotEmpty) {
+ if (!const MapEquality<String, String>().equals(entryMap, expectedSymbols)) {
print('ERROR: $libFlutter exports the wrong symbols');
print(' Expected $expectedSymbols');
print(' Library has $entryMap.');
