1*635a8641SAndroid Build Coastguard Worker# In Android, prefer Android's libbase definitions for LIKELY/UNLIKELY macros. 2*635a8641SAndroid Build Coastguard Worker 3*635a8641SAndroid Build Coastguard Worker--- a/base/compiler_specific.h 4*635a8641SAndroid Build Coastguard Worker+++ b/base/compiler_specific.h 5*635a8641SAndroid Build Coastguard Worker@@ -7,6 +7,11 @@ 6*635a8641SAndroid Build Coastguard Worker 7*635a8641SAndroid Build Coastguard Worker #include "build/build_config.h" 8*635a8641SAndroid Build Coastguard Worker 9*635a8641SAndroid Build Coastguard Worker+#if defined(ANDROID) 10*635a8641SAndroid Build Coastguard Worker+// Prefer Android's libbase definitions to our own. 11*635a8641SAndroid Build Coastguard Worker+#include <android-base/macros.h> 12*635a8641SAndroid Build Coastguard Worker+#endif // defined(ANDROID) 13*635a8641SAndroid Build Coastguard Worker+ 14*635a8641SAndroid Build Coastguard Worker #if defined(COMPILER_MSVC) 15*635a8641SAndroid Build Coastguard Worker 16*635a8641SAndroid Build Coastguard Worker // For _Printf_format_string_. 17