From 3db3281b058ae566fac17745ade71f853d9f3b21 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Wed, 5 Oct 2022 19:18:43 -0700 Subject: [PATCH 1/3] Use llvm version of libcxxabi instead of patched --- DEPS | 2 +- testing/symbols/verify_exported.dart | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index 6db75ed588f10..814fca5c4df2f 100644 --- a/DEPS +++ b/DEPS @@ -127,7 +127,7 @@ deps = { Var('llvm_git') + '/llvm-project/libcxx' + '@' + '44079a4cc04cdeffb9cfe8067bfb3c276fb2bab0', 'src/third_party/libcxxabi': - Var('flutter_git') + '/third_party/libcxxabi' + '@' + '483f071ff4780a8884f32d97d2d262fbe9f1ae18', + Var('llvm_git') + '/llvm-project/libcxxabi' + '@' + '2ce528fb5e0f92e57c97ec3ff53b75359d33af12', 'src/third_party/glfw': Var('fuchsia_git') + '/third_party/glfw' + '@' + '78e6a0063d27ed44c2c4805606309744f6fb29fc', diff --git a/testing/symbols/verify_exported.dart b/testing/symbols/verify_exported.dart index 5634e0b4423c6..76095402c4cdd 100644 --- a/testing/symbols/verify_exported.dart +++ b/testing/symbols/verify_exported.dart @@ -96,9 +96,7 @@ int _checkIos(String outPath, String nmPath, Iterable builds) { final Iterable unexpectedEntries = NmEntry.parse(nmResult.stdout as String).where((NmEntry entry) { return !(((entry.type == '(__DATA,__common)' || entry.type == '(__DATA,__const)') && entry.name.startsWith('_Flutter')) || (entry.type == '(__DATA,__objc_data)' - && (entry.name.startsWith(r'_OBJC_METACLASS_$_Flutter') || entry.name.startsWith(r'_OBJC_CLASS_$_Flutter'))) - // TODO(107887): This should not be neccesary after bitcode support is removed from the engine. - || (entry.type == '(__TEXT,__text)' && entry.name == '___gxx_personality_v0')); + && (entry.name.startsWith(r'_OBJC_METACLASS_$_Flutter') || entry.name.startsWith(r'_OBJC_CLASS_$_Flutter')))); }); if (unexpectedEntries.isNotEmpty) { print('ERROR: $libFlutter exports unexpected symbols:'); From 2a15964dcf86426f32dac484d37debbf5253ddfe Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Wed, 5 Oct 2022 20:47:49 -0700 Subject: [PATCH 2/3] Signature --- ci/licenses_golden/licenses_third_party | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 20c048fe88424..b06aa6ea8be96 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 29d99debc367a46b6ffa9ea6be3d02d1 +Signature: 8188ceb88ac43e99e7f32edb8b1d37e5 UNUSED LICENSES: From 413cf685a99c637fc2324b6e187a5c891fc0188c Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 6 Oct 2022 15:13:50 -0700 Subject: [PATCH 3/3] Signature again --- ci/licenses_golden/licenses_third_party | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index b06aa6ea8be96..924cb59fb6bd3 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 8188ceb88ac43e99e7f32edb8b1d37e5 +Signature: 109519ff070c27e9ae694be51b410bff UNUSED LICENSES: