Index: webrtc/typedefs.h |
diff --git a/webrtc/typedefs.h b/webrtc/typedefs.h |
index 5143d0796c1a2e52574568ffde23c16020224da1..f3839c72951b11aa2a5bdcf3d3886fd2a220c594 100644 |
--- a/webrtc/typedefs.h |
+++ b/webrtc/typedefs.h |
@@ -24,6 +24,7 @@ |
#define WEBRTC_ARCH_64_BITS |
#define WEBRTC_ARCH_LITTLE_ENDIAN |
#elif defined(__aarch64__) |
+#define WEBRTC_ARCH_ARM_FAMILY |
#define WEBRTC_ARCH_64_BITS |
#define WEBRTC_ARCH_LITTLE_ENDIAN |
#elif defined(_M_IX86) || defined(__i386__) |
@@ -32,16 +33,15 @@ |
#define WEBRTC_ARCH_32_BITS |
#define WEBRTC_ARCH_LITTLE_ENDIAN |
#elif defined(__ARMEL__) |
-// TODO(ajm): We'd prefer to control platform defines here, but this is |
-// currently provided by the Android makefiles. Commented to avoid duplicate |
-// definition warnings. |
-//#define WEBRTC_ARCH_ARM |
-// TODO(ajm): Chromium uses the following two defines. Should we switch? |
-//#define WEBRTC_ARCH_ARM_FAMILY |
-//#define WEBRTC_ARCH_ARMEL |
+#define WEBRTC_ARCH_ARM_FAMILY |
#define WEBRTC_ARCH_32_BITS |
#define WEBRTC_ARCH_LITTLE_ENDIAN |
#elif defined(__MIPSEL__) |
+#if defined(__LP64__) |
+#define WEBRTC_ARCH_MIPS64_FAMILY |
+#else |
+#define WEBRTC_ARCH_MIPS_FAMILY |
+#endif |
#define WEBRTC_ARCH_32_BITS |
#define WEBRTC_ARCH_LITTLE_ENDIAN |
#elif defined(__pnacl__) |