From c6d9e040dab93e8ecffbbdcda24bb19538e416e5 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Mon, 19 Nov 2018 23:41:25 +0000 Subject: [PATCH] Revert "[android] Override __cxa_demangle() in PRODUCT mode" This reverts commit 9fce277b7e2a3aa32aff417368b2df8da7afc054. I verfied locally that this change no longer reduces binary size with a custom-built libcxxabi/libcxx and LTO. Change-Id: I05dfb83597c064ba976573da5547ae79c0d41d1c Reviewed-on: https://dart-review.googlesource.com/c/84831 Reviewed-by: Zach Anderson Commit-Queue: Zach Anderson --- runtime/vm/native_symbol_android.cc | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/runtime/vm/native_symbol_android.cc b/runtime/vm/native_symbol_android.cc index 8ed1999dd58..43df38d0f18 100644 --- a/runtime/vm/native_symbol_android.cc +++ b/runtime/vm/native_symbol_android.cc @@ -10,21 +10,6 @@ #include // NOLINT #include // NOLINT -// Even though it's not used in a PRODUCT build, __cxa_demangle() still ends up -// in the resulting binary for Android. Blowing it away by redefining it like -// so saves >90KB of binary size. -#if defined(PRODUCT) -extern "C" char* __cxa_demangle(const char* mangled_name, - char* buf, - size_t* n, - int* status) { - if (status) { - *status = -1; - } - return NULL; -} -#endif - namespace dart { void NativeSymbolResolver::Init() {}