| Index: base/safe_strerror_posix.cc
 | 
| diff --git a/base/safe_strerror_posix.cc b/base/safe_strerror_posix.cc
 | 
| index a91bb8de0cf4cb6d072d6066f7c795f239896019..892592ae0854f56099e0487e07fbdd69df7b5040 100644
 | 
| --- a/base/safe_strerror_posix.cc
 | 
| +++ b/base/safe_strerror_posix.cc
 | 
| @@ -9,7 +9,8 @@
 | 
|  #include <stdio.h>
 | 
|  #include <string.h>
 | 
|  
 | 
| -#define USE_HISTORICAL_STRERRO_R (defined(__GLIBC__) || defined(OS_NACL))
 | 
| +#define USE_HISTORICAL_STRERRO_R (defined(__GLIBC__) || defined(__BIONIC__) || \
 | 
| +                                  defined(OS_NACL))
 | 
|  
 | 
|  #if USE_HISTORICAL_STRERRO_R && defined(__GNUC__)
 | 
|  // GCC will complain about the unused second wrap function unless we tell it
 | 
| 
 |