am 4bddb6f5: Merge "Fix <endian.h> and <sys/endian.h>"

* commit '4bddb6f5f7f1b00f2263b059156dfc07efea920b':
  Fix <endian.h> and <sys/endian.h>

ndk/platforms/android-3/arch-arm/include/machine/_types.h

@@ -116,10 +116,4 @@ typedef	int			__rune_t;
 typedef	void *			__wctrans_t;
 typedef	void *			__wctype_t;
 
-#if defined(__ARMEB__)
-#define _BYTE_ORDER _BIG_ENDIAN
-#else
-#define _BYTE_ORDER _LITTLE_ENDIAN
-#endif
-
 #endif	/* _ARM__TYPES_H_ */

ndk/platforms/android-3/arch-arm/include/machine/endian.h

@@ -77,6 +77,11 @@
 #endif  /* __ARM_ARCH__ */
 #endif  /* __GNUC__ */
 
+#if defined(__ARMEB__)
+#define _BYTE_ORDER _BIG_ENDIAN
+#else
+#define _BYTE_ORDER _LITTLE_ENDIAN
+#endif
 #define __STRICT_ALIGNMENT
 #include <sys/types.h>
 #include <sys/endian.h>

ndk/platforms/android-3/include/sys/endian.h

@@ -37,6 +37,7 @@
 #define _SYS_ENDIAN_H_
 
 #include <sys/cdefs.h>
+#include <machine/endian.h>
 #include <machine/_types.h>
 
 #define _LITTLE_ENDIAN	1234

ndk/platforms/android-9/arch-mips/include/machine/_types.h

@@ -124,12 +124,6 @@ typedef	int			__rune_t;
 typedef	void *			__wctrans_t;
 typedef	void *			__wctype_t;
 
-#if defined(__MIPSEB__)
-#define _BYTE_ORDER _BIG_ENDIAN
-#else
-#define _BYTE_ORDER _LITTLE_ENDIAN
-#endif
-
 #if defined(_KERNEL)
 typedef struct label_t {
 	__register_t val[14];

ndk/platforms/android-9/arch-mips/include/machine/endian.h

@@ -58,6 +58,11 @@
 #endif  /* __mips32r2__ */
 #endif  /* __GNUC__ */
 
+#if defined(__MIPSEB__)
+#define _BYTE_ORDER _BIG_ENDIAN
+#else
+#define _BYTE_ORDER _LITTLE_ENDIAN
+#endif
 #define __STRICT_ALIGNMENT
 #include <sys/types.h>
 #include <sys/endian.h>

ndk/platforms/android-9/arch-x86/include/machine/_types.h

@@ -132,6 +132,4 @@ typedef	void *			__wctype_t;
 #define __HAVE_CPUINFO
 #define __HAVE_MUTEX
 
-#define _BYTE_ORDER _LITTLE_ENDIAN
-
 #endif	/* _I386__TYPES_H_ */

ndk/platforms/android-9/arch-x86/include/machine/endian.h

@@ -64,6 +64,7 @@
 
 #endif	/* __GNUC__ */
 
+#define _BYTE_ORDER _LITTLE_ENDIAN
 #include <sys/types.h>
 #include <sys/endian.h>