hmz007
36ed224bac
Signed-off-by: hmz007 <hmz007@gmail.com> Change-Id: Ib87fdbe7a0be7dc961af3500fe9ea4589a127f9f
17 lines
398 B
Diff
17 lines
398 B
Diff
# In Android, prefer Android's libbase definitions for LIKELY/UNLIKELY macros.
|
|
|
|
--- a/base/compiler_specific.h
|
|
+++ b/base/compiler_specific.h
|
|
@@ -7,6 +7,11 @@
|
|
|
|
#include "build/build_config.h"
|
|
|
|
+#if defined(ANDROID)
|
|
+// Prefer Android's libbase definitions to our own.
|
|
+#include <android-base/macros.h>
|
|
+#endif // defined(ANDROID)
|
|
+
|
|
#if defined(COMPILER_MSVC)
|
|
|
|
// For _Printf_format_string_.
|