Skip to content

Commit 8166a91

Browse files
dnfielddnfield
authored
Revert "Reland Clang 11, roll buildroot to 1bc40a5, take 3 (flutter#17467)" (flutter#17482)
This reverts commit 39b7718.
1 parent 573e4e2 commit 8166a91

File tree

6 files changed

+14
-114
lines changed

6 files changed

+14
-114
lines changed

‎DEPS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ allowed_hosts = [
136136
]
137137

138138
deps = {
139-
'src': 'https://github.com/flutter/buildroot.git' + '@' + '1bc40a5f916adb93d87e2a2230a0ec43db876c1c',
139+
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a0fb98af7b6f50f17b47ab7968f3f5664d0d6316',
140140

141141
# Fuchsia compatibility
142142
#
@@ -517,8 +517,8 @@ deps = {
517517
'src/buildtools/{host_os}-x64/clang': {
518518
'packages': [
519519
{
520-
'package': 'fuchsia/third_party/clang/${{platform}}',
521-
'version': 'git_revision:7e9747b50bcb1be28d4a3236571e8050835497a6'
520+
'package': 'fuchsia/clang/${{platform}}',
521+
'version': 'git_revision:de39621f0f03f20633bdfa50bde97a3908bf6e98'
522522
}
523523
],
524524
'condition': 'host_os == "mac" or host_os == "linux"',

‎flow/layers/performance_overlay_layer_unittests.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ static void TestPerformanceOverlayLayerGold(int refresh_rate) {
8888
<< "Please either set --golden-dir, or make sure that the unit test is "
8989
<< "run from the right directory (e.g., flutter/engine/src).";
9090

91-
// TODO(https://github.com/flutter/flutter/issues/53784): enable this on all
92-
// platforms.
9391
#if !defined(OS_LINUX)
9492
GTEST_SKIP() << "Skipping golden tests on non-Linux OSes";
9593
#endif // OS_LINUX

‎shell/platform/embedder/tests/embedder_unittests.cc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,7 +1430,7 @@ TEST_F(EmbedderTest,
14301430
});
14311431

14321432
context.GetCompositor().SetPlatformViewRendererCallback(
1433-
[&](const FlutterLayer& layer, GrContext*
1433+
[&](const FlutterLayer& layer, GrContext *
14341434
/* don't use because software compositor */) -> sk_sp<SkImage> {
14351435
auto surface = CreateRenderSurface(
14361436
layer, nullptr /* null because software compositor */);
@@ -3001,12 +3001,6 @@ TEST_F(EmbedderTest, VerifyB143464703WithSoftwareBackend) {
30013001
auto renderered_scene = context.GetNextSceneImage();
30023002

30033003
latch.Wait();
3004-
3005-
// TODO(https://github.com/flutter/flutter/issues/53784): enable this on all
3006-
// platforms.
3007-
#if !defined(OS_LINUX)
3008-
GTEST_SKIP() << "Skipping golden tests on non-Linux OSes";
3009-
#endif // OS_LINUX
30103004
ASSERT_TRUE(ImageMatchesFixture("verifyb143464703_soft_noxform.png",
30113005
renderered_scene));
30123006
}

‎sky/tools/create_ios_framework.py

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
import os
1111

1212

13-
DSYMUTIL = os.path.join(os.path.dirname(__file__), '..', '..', '..',
14-
'buildtools', 'mac-x64', 'clang', 'bin', 'dsymutil')
15-
1613
def main():
1714
parser = argparse.ArgumentParser(description='Creates Flutter.framework')
1815

@@ -36,31 +33,27 @@ def main():
3633
simulator_dylib = os.path.join(simulator_framework, 'Flutter')
3734

3835
if not os.path.isdir(arm64_framework):
39-
print('Cannot find iOS arm64 Framework at %s' % arm64_framework)
36+
print 'Cannot find iOS arm64 Framework at', arm64_framework
4037
return 1
4138

4239
if not os.path.isdir(armv7_framework):
43-
print('Cannot find iOS armv7 Framework at %s' % armv7_framework)
40+
print 'Cannot find iOS armv7 Framework at', armv7_framework
4441
return 1
4542

4643
if not os.path.isdir(simulator_framework):
47-
print('Cannot find iOS simulator Framework at %s' % simulator_framework)
44+
print 'Cannot find iOS simulator Framework at', simulator_framework
4845
return 1
4946

5047
if not os.path.isfile(arm64_dylib):
51-
print('Cannot find iOS arm64 dylib at %s' % arm64_dylib)
48+
print 'Cannot find iOS arm64 dylib at', arm64_dylib
5249
return 1
5350

5451
if not os.path.isfile(armv7_dylib):
55-
print('Cannot find iOS armv7 dylib at %s' % armv7_dylib)
52+
print 'Cannot find iOS armv7 dylib at', armv7_dylib
5653
return 1
5754

5855
if not os.path.isfile(simulator_dylib):
59-
print('Cannot find iOS simulator dylib at %s' % simulator_dylib)
60-
return 1
61-
62-
if not os.path.isfile(DSYMUTIL):
63-
print('Cannot find dsymutil at %s' % DSYMUTIL)
56+
print 'Cannot find iOS simulator dylib at', simulator_dylib
6457
return 1
6558

6659
shutil.rmtree(fat_framework, True)
@@ -83,7 +76,7 @@ def main():
8376

8477
if args.dsym:
8578
dsym_out = os.path.splitext(fat_framework)[0] + '.dSYM'
86-
subprocess.check_call([DSYMUTIL, '-o', dsym_out, linker_out])
79+
subprocess.check_call(['dsymutil', '-o', dsym_out, linker_out])
8780

8881
if args.strip:
8982
# copy unstripped

‎testing/dart/canvas_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void main() {
181181
final bool areEqual =
182182
await fuzzyGoldenImageCompare(image, 'canvas_test_gradient.png');
183183
expect(areEqual, true);
184-
}, skip: !Platform.isLinux); // https://github.com/flutter/flutter/issues/53784
184+
});
185185

186186
test('Simple dithered gradient', () async {
187187
Paint.enableDithering = true;
@@ -197,5 +197,5 @@ void main() {
197197
final bool areEqual =
198198
await fuzzyGoldenImageCompare(image, 'canvas_test_dithered_gradient.png');
199199
expect(areEqual, true);
200-
}, skip: !Platform.isLinux); // https://github.com/flutter/flutter/issues/53784
200+
});
201201
}

‎testing/symbols/verify_exported.dart

Lines changed: 1 addition & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -110,93 +110,8 @@ int _checkAndroid(String outPath, String nmPath, Iterable<String> builds) {
110110
'JNI_OnLoad': 'T',
111111
'_binary_icudtl_dat_size': 'A',
112112
'_binary_icudtl_dat_start': 'D',
113-
// TODO(fxb/47943): Remove these once Clang lld does not expose them.
114-
// arm
115-
'__adddf3': 'T',
116-
'__addsf3': 'T',
117-
'__aeabi_cdcmpeq': 'T',
118-
'__aeabi_cdcmple': 'T',
119-
'__aeabi_cdrcmple': 'T',
120-
'__aeabi_d2lz': 'T',
121-
'__aeabi_d2uiz': 'T',
122-
'__aeabi_d2ulz': 'T',
123-
'__aeabi_dadd': 'T',
124-
'__aeabi_dcmpeq': 'T',
125-
'__aeabi_dcmpge': 'T',
126-
'__aeabi_dcmpgt': 'T',
127-
'__aeabi_dcmple': 'T',
128-
'__aeabi_dcmplt': 'T',
129-
'__aeabi_ddiv': 'T',
130-
'__aeabi_dmul': 'T',
131-
'__aeabi_drsub': 'T',
132-
'__aeabi_dsub': 'T',
133-
'__aeabi_f2d': 'T',
134-
'__aeabi_fadd': 'T',
135-
'__aeabi_frsub': 'T',
136-
'__aeabi_fsub': 'T',
137-
'__aeabi_i2d': 'T',
138-
'__aeabi_i2f': 'T',
139-
'__aeabi_l2d': 'T',
140-
'__aeabi_l2f': 'T',
141-
'__aeabi_lasr': 'T',
142-
'__aeabi_ldivmod': 'T',
143-
'__aeabi_llsl': 'T',
144-
'__aeabi_llsr': 'T',
145-
'__aeabi_ui2d': 'T',
146-
'__aeabi_ui2f': 'T',
147-
'__aeabi_uidiv': 'T',
148-
'__aeabi_uidivmod': 'T',
149-
'__aeabi_ul2d': 'T',
150-
'__aeabi_ul2f': 'T',
151-
'__aeabi_uldivmod': 'T',
152-
'__ashldi3': 'T',
153-
'__ashrdi3': 'T',
154-
'__cmpdf2': 'T',
155-
'__divdf3': 'T',
156-
'__divdi3': 'T',
157-
'__eqdf2': 'T',
158-
'__extendsfdf2': 'T',
159-
'__fixdfdi': 'T',
160-
'__fixunsdfdi': 'T',
161-
'__fixunsdfsi': 'T',
162-
'__floatdidf': 'T',
163-
'__floatdisf': 'T',
164-
'__floatsidf': 'T',
165-
'__floatsisf': 'T',
166-
'__floatundidf': 'T',
167-
'__floatundisf': 'T',
168-
'__floatunsidf': 'T',
169-
'__floatunsisf': 'T',
170-
'__gedf2': 'T',
171-
'__gnu_ldivmod_helper': 'T',
172-
'__gnu_uldivmod_helper': 'T',
173-
'__gtdf2': 'T',
174-
'__ledf2': 'T',
175-
'__lshrdi3': 'T',
176-
'__ltdf2': 'T',
177-
'__muldf3': 'T',
178-
'__nedf2': 'T',
179-
'__subdf3': 'T',
180-
'__subsf3': 'T',
181-
'__udivdi3': 'T',
182-
'__udivsi3': 'T',
183-
// arm64
184-
'__clz_tab': 'R',
185-
'__udivti3': 'T',
186-
// arm64 && x64
187-
'__emutls_get_address': 'T',
188-
'__emutls_register_common': 'T',
189-
// jit x86
190-
'__moddi3': 'T',
191-
'__umoddi3': 'T',
192113
};
193-
final Map<String, String> badSymbols = <String, String>{};
194-
for (final String key in entryMap.keys) {
195-
if (entryMap[key] != expectedSymbols[key]) {
196-
badSymbols[key] = entryMap[key];
197-
}
198-
}
199-
if (badSymbols.isNotEmpty) {
114+
if (!const MapEquality<String, String>().equals(entryMap, expectedSymbols)) {
200115
print('ERROR: $libFlutter exports the wrong symbols');
201116
print(' Expected $expectedSymbols');
202117
print(' Library has $entryMap.');

0 commit comments

Comments
 (0)