Use llvm version of libcxxabi instead of patched mirror (flutter#36634)

whugintama · Oct 6, 2022 · e30b37a · e30b37a
1 parent f54650f
commit e30b37a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
-Signature: 29d99debc367a46b6ffa9ea6be3d02d1
+Signature: 109519ff070c27e9ae694be51b410bff
 
 UNUSED LICENSES:
 

diff --git a/testing/symbols/verify_exported.dart b/testing/symbols/verify_exported.dart
@@ -96,9 +96,7 @@ int _checkIos(String outPath, String nmPath, Iterable<String> builds) {
     final Iterable<NmEntry> 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:');