| Index: third_party/tcmalloc/chromium/src/config_android.h | 
| diff --git a/third_party/tcmalloc/chromium/src/config_linux.h b/third_party/tcmalloc/chromium/src/config_android.h | 
| similarity index 97% | 
| copy from third_party/tcmalloc/chromium/src/config_linux.h | 
| copy to third_party/tcmalloc/chromium/src/config_android.h | 
| index abf044264803f6dcb2af76baeb80817f8bbcab10..0743aade3ff63a73a96c052a80549d99d1cfbf5f 100644 | 
| --- a/third_party/tcmalloc/chromium/src/config_linux.h | 
| +++ b/third_party/tcmalloc/chromium/src/config_android.h | 
| @@ -56,7 +56,7 @@ | 
| #define HAVE_GETPAGESIZE 1 | 
|  | 
| /* Define to 1 if you have the <glob.h> header file. */ | 
| -#define HAVE_GLOB_H 1 | 
| +#undef HAVE_GLOB_H | 
|  | 
| /* Define to 1 if you have the <grp.h> header file. */ | 
| #define HAVE_GRP_H 1 | 
| @@ -89,7 +89,7 @@ | 
| #define HAVE_POLL_H 1 | 
|  | 
| /* define if libc has program_invocation_name */ | 
| -#define HAVE_PROGRAM_INVOCATION_NAME 1 | 
| +#undef HAVE_PROGRAM_INVOCATION_NAME | 
|  | 
| /* Define if you have POSIX threads libraries and header files. */ | 
| #define HAVE_PTHREAD 1 | 
| @@ -155,10 +155,10 @@ | 
| #define HAVE_SYS_WAIT_H 1 | 
|  | 
| /* Define to 1 if compiler supports __thread */ | 
| -#define HAVE_TLS 1 | 
| +#undef HAVE_TLS | 
|  | 
| /* <sys/ucontext.h> is broken on redhat 7 */ | 
| -#define HAVE_UCONTEXT_H 1 | 
| +#undef HAVE_UCONTEXT_H | 
|  | 
| /* Define to 1 if you have the <unistd.h> header file. */ | 
| #define HAVE_UNISTD_H 1 | 
| @@ -227,7 +227,7 @@ | 
| functions/classes. It's safe to define this here because config.h is only | 
| used internally, to compile the DLL, and every DLL source file #includes | 
| "config.h" before anything else. */ | 
| -#define PERFTOOLS_DLL_DECL | 
| +#define PERFTOOLS_DLL_DECL | 
|  | 
| /* printf format code for printing a size_t and ssize_t */ | 
| #define PRIdS "zd" | 
| @@ -266,3 +266,6 @@ | 
| #ifdef __MINGW32__ | 
| #include "windows/mingw.h" | 
| #endif | 
| + | 
| +/* Android's NDK doesn't have std::set_new_handler */ | 
| +#define PREANSINEW 1 | 
|  |