summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--android-ndk-r7/platforms/android-14/arch-arm/usr/include/asm/types.h2
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-arm/usr/lib/libEGL.sobin5479 -> 5479 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-arm/usr/lib/libGLESv1_CM.sobin23431 -> 23431 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-arm/usr/lib/libGLESv2.sobin18463 -> 18463 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-arm/usr/lib/libOpenMAXAL.sobin5597 -> 5597 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-arm/usr/lib/libOpenSLES.sobin6102 -> 6102 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-arm/usr/lib/libandroid.sobin17823 -> 17823 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-arm/usr/lib/libc.sobin82473 -> 82473 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-arm/usr/lib/libdl.sobin2253 -> 2253 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-arm/usr/lib/libjnigraphics.sobin2118 -> 2118 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-arm/usr/lib/liblog.sobin2557 -> 2557 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-arm/usr/lib/libm.sobin14897 -> 14897 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-arm/usr/lib/libstdc++.sobin4193 -> 4193 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-arm/usr/lib/libthread_db.sobin2766 -> 2766 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-arm/usr/lib/libz.sobin7735 -> 7735 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-x86/usr/lib/libEGL.sobin4340 -> 4340 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-x86/usr/lib/libGLESv1_CM.sobin22932 -> 22932 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-x86/usr/lib/libGLESv2.sobin17757 -> 17757 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-x86/usr/lib/libOpenMAXAL.sobin4963 -> 4963 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-x86/usr/lib/libOpenSLES.sobin5468 -> 5468 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-x86/usr/lib/libandroid.sobin15112 -> 15112 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-x86/usr/lib/libc.sobin65046 -> 65046 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-x86/usr/lib/libdl.sobin1601 -> 1601 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-x86/usr/lib/libjnigraphics.sobin1519 -> 1519 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-x86/usr/lib/liblog.sobin2022 -> 2022 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-x86/usr/lib/libm.sobin13044 -> 13044 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-x86/usr/lib/libstdc++.sobin3192 -> 3192 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-14/arch-x86/usr/lib/libz.sobin6286 -> 6286 bytes
-rw-r--r--android-ndk-r7/platforms/android-3/arch-arm/usr/include/asm/types.h2
-rwxr-xr-xandroid-ndk-r7/platforms/android-3/arch-arm/usr/lib/libc.sobin73968 -> 73968 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-3/arch-arm/usr/lib/libdl.sobin2182 -> 2182 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-3/arch-arm/usr/lib/liblog.sobin2557 -> 2557 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-3/arch-arm/usr/lib/libm.sobin14897 -> 14897 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-3/arch-arm/usr/lib/libstdc++.sobin4193 -> 4193 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-3/arch-arm/usr/lib/libthread_db.sobin2766 -> 2766 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-3/arch-arm/usr/lib/libz.sobin7735 -> 7735 bytes
-rw-r--r--android-ndk-r7/platforms/android-4/arch-arm/usr/include/asm/types.h2
-rwxr-xr-xandroid-ndk-r7/platforms/android-4/arch-arm/usr/lib/libGLESv1_CM.sobin23431 -> 23431 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-4/arch-arm/usr/lib/libc.sobin73968 -> 73968 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-4/arch-arm/usr/lib/libdl.sobin2182 -> 2182 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-4/arch-arm/usr/lib/liblog.sobin2557 -> 2557 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-4/arch-arm/usr/lib/libm.sobin14897 -> 14897 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-4/arch-arm/usr/lib/libstdc++.sobin4193 -> 4193 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-4/arch-arm/usr/lib/libthread_db.sobin2766 -> 2766 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-4/arch-arm/usr/lib/libz.sobin7735 -> 7735 bytes
-rw-r--r--android-ndk-r7/platforms/android-5/arch-arm/usr/include/asm/types.h2
-rwxr-xr-xandroid-ndk-r7/platforms/android-5/arch-arm/usr/lib/libGLESv1_CM.sobin23431 -> 23431 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-5/arch-arm/usr/lib/libGLESv2.sobin18463 -> 18463 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-5/arch-arm/usr/lib/libc.sobin74761 -> 74761 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-5/arch-arm/usr/lib/libdl.sobin2182 -> 2182 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-5/arch-arm/usr/lib/liblog.sobin2557 -> 2557 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-5/arch-arm/usr/lib/libm.sobin14897 -> 14897 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-5/arch-arm/usr/lib/libstdc++.sobin4193 -> 4193 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-5/arch-arm/usr/lib/libthread_db.sobin2766 -> 2766 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-5/arch-arm/usr/lib/libz.sobin7735 -> 7735 bytes
-rw-r--r--android-ndk-r7/platforms/android-8/arch-arm/usr/include/asm/types.h2
-rwxr-xr-xandroid-ndk-r7/platforms/android-8/arch-arm/usr/lib/libGLESv1_CM.sobin23431 -> 23431 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-8/arch-arm/usr/lib/libGLESv2.sobin18463 -> 18463 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-8/arch-arm/usr/lib/libc.sobin79433 -> 79433 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-8/arch-arm/usr/lib/libdl.sobin2253 -> 2253 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-8/arch-arm/usr/lib/libjnigraphics.sobin2118 -> 2118 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-8/arch-arm/usr/lib/liblog.sobin2557 -> 2557 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-8/arch-arm/usr/lib/libm.sobin14897 -> 14897 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-8/arch-arm/usr/lib/libstdc++.sobin4193 -> 4193 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-8/arch-arm/usr/lib/libthread_db.sobin2766 -> 2766 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-8/arch-arm/usr/lib/libz.sobin7735 -> 7735 bytes
-rw-r--r--android-ndk-r7/platforms/android-9/arch-arm/usr/include/asm/types.h2
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-arm/usr/lib/libEGL.sobin5479 -> 5479 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-arm/usr/lib/libGLESv1_CM.sobin23431 -> 23431 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-arm/usr/lib/libGLESv2.sobin18463 -> 18463 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-arm/usr/lib/libOpenSLES.sobin6102 -> 6102 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-arm/usr/lib/libandroid.sobin17823 -> 17823 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-arm/usr/lib/libc.sobin82473 -> 82473 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-arm/usr/lib/libdl.sobin2253 -> 2253 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-arm/usr/lib/libjnigraphics.sobin2118 -> 2118 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-arm/usr/lib/liblog.sobin2557 -> 2557 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-arm/usr/lib/libm.sobin14897 -> 14897 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-arm/usr/lib/libstdc++.sobin4193 -> 4193 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-arm/usr/lib/libthread_db.sobin2766 -> 2766 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-arm/usr/lib/libz.sobin7735 -> 7735 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-x86/usr/lib/libEGL.sobin4340 -> 4340 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-x86/usr/lib/libGLESv1_CM.sobin22932 -> 22932 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-x86/usr/lib/libGLESv2.sobin17757 -> 17757 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-x86/usr/lib/libOpenSLES.sobin5468 -> 5468 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-x86/usr/lib/libandroid.sobin15112 -> 15112 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-x86/usr/lib/libc.sobin65046 -> 65046 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-x86/usr/lib/libdl.sobin1601 -> 1601 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-x86/usr/lib/libjnigraphics.sobin1519 -> 1519 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-x86/usr/lib/liblog.sobin2022 -> 2022 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-x86/usr/lib/libm.sobin13044 -> 13044 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-x86/usr/lib/libstdc++.sobin3192 -> 3192 bytes
-rwxr-xr-xandroid-ndk-r7/platforms/android-9/arch-x86/usr/lib/libz.sobin6286 -> 6286 bytes
-rwxr-xr-xandroid-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_shared.sobin30343 -> 28298 bytes
-rw-r--r--android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_static.abin58212 -> 57252 bytes
-rwxr-xr-xandroid-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_shared.sobin28414 -> 28414 bytes
-rw-r--r--android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_static.abin57312 -> 57308 bytes
-rwxr-xr-xandroid-ndk-r7/sources/cxx-stl/gabi++/libs/x86/libgabi++_shared.sobin28531 -> 28531 bytes
-rw-r--r--android-ndk-r7/sources/cxx-stl/gabi++/libs/x86/libgabi++_static.abin64022 -> 64022 bytes
-rwxr-xr-xandroid-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.sobin817734 -> 817726 bytes
-rw-r--r--android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_static.abin1962428 -> 1962428 bytes
-rw-r--r--android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libsupc++.abin302370 -> 302370 bytes
-rwxr-xr-xandroid-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_shared.sobin832542 -> 832530 bytes
-rw-r--r--android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_static.abin1962984 -> 1962984 bytes
-rw-r--r--android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libsupc++.abin302290 -> 302290 bytes
-rwxr-xr-xandroid-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_shared.sobin918065 -> 918041 bytes
-rw-r--r--android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_static.abin1644538 -> 1644506 bytes
-rw-r--r--android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libsupc++.abin318540 -> 318508 bytes
-rwxr-xr-xandroid-ndk-r7/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_shared.sobin565063 -> 564179 bytes
-rw-r--r--android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_static.abin728884 -> 727924 bytes
-rwxr-xr-xandroid-ndk-r7/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.sobin565551 -> 564295 bytes
-rw-r--r--android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi/libstlport_static.abin727984 -> 727980 bytes
-rwxr-xr-xandroid-ndk-r7/sources/cxx-stl/stlport/libs/x86/libstlport_shared.sobin523147 -> 523135 bytes
-rw-r--r--android-ndk-r7/sources/cxx-stl/stlport/libs/x86/libstlport_static.abin776512 -> 776512 bytes
-rw-r--r--android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_cmath.h6
-rw-r--r--android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_mbstate_t.h2
-rw-r--r--android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_pair.h2
-rw-r--r--android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/config/_system.h2
-rw-r--r--android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/pointers/_tools.h24
118 files changed, 24 insertions, 24 deletions
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/include/asm/types.h b/android-ndk-r7/platforms/android-14/arch-arm/usr/include/asm/types.h
index ec60f10..80cea8d 100644
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/include/asm/types.h
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/include/asm/types.h
@@ -25,7 +25,7 @@ typedef unsigned short __u16;
typedef __signed__ int __s32;
typedef unsigned int __u32;
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#ifdef __GNUC__
typedef __signed__ long long __s64;
typedef unsigned long long __u64;
#endif
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libEGL.so b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libEGL.so
index bc0e66e..5bd7f30 100755
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libEGL.so
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libEGL.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libGLESv1_CM.so b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libGLESv1_CM.so
index 344c046..d8f9723 100755
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libGLESv1_CM.so
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libGLESv1_CM.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libGLESv2.so b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libGLESv2.so
index 181df7a..ea4d19c 100755
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libGLESv2.so
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libGLESv2.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libOpenMAXAL.so b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libOpenMAXAL.so
index f801d6e..90b7929 100755
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libOpenMAXAL.so
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libOpenMAXAL.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libOpenSLES.so b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libOpenSLES.so
index 3efc100..af77566 100755
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libOpenSLES.so
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libOpenSLES.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libandroid.so b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libandroid.so
index fd59a4d..a5f456b 100755
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libandroid.so
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libandroid.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libc.so b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libc.so
index cca301b..d7aa49a 100755
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libc.so
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libc.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libdl.so b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libdl.so
index df4a325..56e6674 100755
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libdl.so
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libdl.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libjnigraphics.so b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libjnigraphics.so
index 0bc4b74..fbe903c 100755
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libjnigraphics.so
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libjnigraphics.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/liblog.so b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/liblog.so
index 3c0ed1d..07e8250 100755
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/liblog.so
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/liblog.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libm.so b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libm.so
index deda7d1..dec5dde 100755
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libm.so
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libm.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libstdc++.so b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libstdc++.so
index f5a0775..b9f5e72 100755
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libstdc++.so
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libstdc++.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libthread_db.so b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libthread_db.so
index 5104c2c..54b50c8 100755
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libthread_db.so
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libthread_db.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libz.so b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libz.so
index beb6abe..9f8c193 100755
--- a/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libz.so
+++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/lib/libz.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libEGL.so b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libEGL.so
index 5d5e317..dcde3c6 100755
--- a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libEGL.so
+++ b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libEGL.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libGLESv1_CM.so b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libGLESv1_CM.so
index bdf03df..4045443 100755
--- a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libGLESv1_CM.so
+++ b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libGLESv1_CM.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libGLESv2.so b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libGLESv2.so
index 7801167..a1e773c 100755
--- a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libGLESv2.so
+++ b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libGLESv2.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libOpenMAXAL.so b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libOpenMAXAL.so
index 2150934..4f50078 100755
--- a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libOpenMAXAL.so
+++ b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libOpenMAXAL.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libOpenSLES.so b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libOpenSLES.so
index 6732436..cb55f5d 100755
--- a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libOpenSLES.so
+++ b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libOpenSLES.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libandroid.so b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libandroid.so
index 58dfe03..8e7db22 100755
--- a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libandroid.so
+++ b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libandroid.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libc.so b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libc.so
index 916150a..d052e6f 100755
--- a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libc.so
+++ b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libc.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libdl.so b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libdl.so
index 7915ad2..a334c3e 100755
--- a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libdl.so
+++ b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libdl.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libjnigraphics.so b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libjnigraphics.so
index 12581d7..b044e02 100755
--- a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libjnigraphics.so
+++ b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libjnigraphics.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/liblog.so b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/liblog.so
index d03a633..d9ce18e 100755
--- a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/liblog.so
+++ b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/liblog.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libm.so b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libm.so
index 160f7cd..cee4464 100755
--- a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libm.so
+++ b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libm.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libstdc++.so b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libstdc++.so
index d78aeec..12c0131 100755
--- a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libstdc++.so
+++ b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libstdc++.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libz.so b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libz.so
index c85e733..74c6b12 100755
--- a/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libz.so
+++ b/android-ndk-r7/platforms/android-14/arch-x86/usr/lib/libz.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-3/arch-arm/usr/include/asm/types.h b/android-ndk-r7/platforms/android-3/arch-arm/usr/include/asm/types.h
index ec60f10..80cea8d 100644
--- a/android-ndk-r7/platforms/android-3/arch-arm/usr/include/asm/types.h
+++ b/android-ndk-r7/platforms/android-3/arch-arm/usr/include/asm/types.h
@@ -25,7 +25,7 @@ typedef unsigned short __u16;
typedef __signed__ int __s32;
typedef unsigned int __u32;
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#ifdef __GNUC__
typedef __signed__ long long __s64;
typedef unsigned long long __u64;
#endif
diff --git a/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libc.so b/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libc.so
index e08ba5e..c95151a 100755
--- a/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libc.so
+++ b/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libc.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libdl.so b/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libdl.so
index f1ef0a2..baba783 100755
--- a/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libdl.so
+++ b/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libdl.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/liblog.so b/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/liblog.so
index 3c0ed1d..07e8250 100755
--- a/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/liblog.so
+++ b/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/liblog.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libm.so b/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libm.so
index deda7d1..dec5dde 100755
--- a/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libm.so
+++ b/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libm.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libstdc++.so b/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libstdc++.so
index f5a0775..b9f5e72 100755
--- a/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libstdc++.so
+++ b/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libstdc++.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libthread_db.so b/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libthread_db.so
index 5104c2c..54b50c8 100755
--- a/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libthread_db.so
+++ b/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libthread_db.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libz.so b/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libz.so
index beb6abe..9f8c193 100755
--- a/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libz.so
+++ b/android-ndk-r7/platforms/android-3/arch-arm/usr/lib/libz.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-4/arch-arm/usr/include/asm/types.h b/android-ndk-r7/platforms/android-4/arch-arm/usr/include/asm/types.h
index ec60f10..80cea8d 100644
--- a/android-ndk-r7/platforms/android-4/arch-arm/usr/include/asm/types.h
+++ b/android-ndk-r7/platforms/android-4/arch-arm/usr/include/asm/types.h
@@ -25,7 +25,7 @@ typedef unsigned short __u16;
typedef __signed__ int __s32;
typedef unsigned int __u32;
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#ifdef __GNUC__
typedef __signed__ long long __s64;
typedef unsigned long long __u64;
#endif
diff --git a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libGLESv1_CM.so b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libGLESv1_CM.so
index 344c046..d8f9723 100755
--- a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libGLESv1_CM.so
+++ b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libGLESv1_CM.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libc.so b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libc.so
index e08ba5e..c95151a 100755
--- a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libc.so
+++ b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libc.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libdl.so b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libdl.so
index f1ef0a2..baba783 100755
--- a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libdl.so
+++ b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libdl.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/liblog.so b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/liblog.so
index 3c0ed1d..07e8250 100755
--- a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/liblog.so
+++ b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/liblog.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libm.so b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libm.so
index deda7d1..dec5dde 100755
--- a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libm.so
+++ b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libm.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libstdc++.so b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libstdc++.so
index f5a0775..b9f5e72 100755
--- a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libstdc++.so
+++ b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libstdc++.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libthread_db.so b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libthread_db.so
index 5104c2c..54b50c8 100755
--- a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libthread_db.so
+++ b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libthread_db.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libz.so b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libz.so
index beb6abe..9f8c193 100755
--- a/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libz.so
+++ b/android-ndk-r7/platforms/android-4/arch-arm/usr/lib/libz.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-5/arch-arm/usr/include/asm/types.h b/android-ndk-r7/platforms/android-5/arch-arm/usr/include/asm/types.h
index ec60f10..80cea8d 100644
--- a/android-ndk-r7/platforms/android-5/arch-arm/usr/include/asm/types.h
+++ b/android-ndk-r7/platforms/android-5/arch-arm/usr/include/asm/types.h
@@ -25,7 +25,7 @@ typedef unsigned short __u16;
typedef __signed__ int __s32;
typedef unsigned int __u32;
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#ifdef __GNUC__
typedef __signed__ long long __s64;
typedef unsigned long long __u64;
#endif
diff --git a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libGLESv1_CM.so b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libGLESv1_CM.so
index 344c046..d8f9723 100755
--- a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libGLESv1_CM.so
+++ b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libGLESv1_CM.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libGLESv2.so b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libGLESv2.so
index 181df7a..ea4d19c 100755
--- a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libGLESv2.so
+++ b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libGLESv2.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libc.so b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libc.so
index 5ed30e9..ebc5441 100755
--- a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libc.so
+++ b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libc.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libdl.so b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libdl.so
index f1ef0a2..baba783 100755
--- a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libdl.so
+++ b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libdl.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/liblog.so b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/liblog.so
index 3c0ed1d..07e8250 100755
--- a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/liblog.so
+++ b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/liblog.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libm.so b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libm.so
index deda7d1..dec5dde 100755
--- a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libm.so
+++ b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libm.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libstdc++.so b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libstdc++.so
index f5a0775..b9f5e72 100755
--- a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libstdc++.so
+++ b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libstdc++.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libthread_db.so b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libthread_db.so
index 5104c2c..54b50c8 100755
--- a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libthread_db.so
+++ b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libthread_db.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libz.so b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libz.so
index beb6abe..9f8c193 100755
--- a/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libz.so
+++ b/android-ndk-r7/platforms/android-5/arch-arm/usr/lib/libz.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-8/arch-arm/usr/include/asm/types.h b/android-ndk-r7/platforms/android-8/arch-arm/usr/include/asm/types.h
index ec60f10..80cea8d 100644
--- a/android-ndk-r7/platforms/android-8/arch-arm/usr/include/asm/types.h
+++ b/android-ndk-r7/platforms/android-8/arch-arm/usr/include/asm/types.h
@@ -25,7 +25,7 @@ typedef unsigned short __u16;
typedef __signed__ int __s32;
typedef unsigned int __u32;
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#ifdef __GNUC__
typedef __signed__ long long __s64;
typedef unsigned long long __u64;
#endif
diff --git a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libGLESv1_CM.so b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libGLESv1_CM.so
index 344c046..d8f9723 100755
--- a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libGLESv1_CM.so
+++ b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libGLESv1_CM.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libGLESv2.so b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libGLESv2.so
index 181df7a..ea4d19c 100755
--- a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libGLESv2.so
+++ b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libGLESv2.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libc.so b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libc.so
index 861378c..4d296ec 100755
--- a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libc.so
+++ b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libc.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libdl.so b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libdl.so
index df4a325..56e6674 100755
--- a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libdl.so
+++ b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libdl.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libjnigraphics.so b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libjnigraphics.so
index 0bc4b74..fbe903c 100755
--- a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libjnigraphics.so
+++ b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libjnigraphics.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/liblog.so b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/liblog.so
index 3c0ed1d..07e8250 100755
--- a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/liblog.so
+++ b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/liblog.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libm.so b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libm.so
index deda7d1..dec5dde 100755
--- a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libm.so
+++ b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libm.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libstdc++.so b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libstdc++.so
index f5a0775..b9f5e72 100755
--- a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libstdc++.so
+++ b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libstdc++.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libthread_db.so b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libthread_db.so
index 5104c2c..54b50c8 100755
--- a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libthread_db.so
+++ b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libthread_db.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libz.so b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libz.so
index beb6abe..9f8c193 100755
--- a/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libz.so
+++ b/android-ndk-r7/platforms/android-8/arch-arm/usr/lib/libz.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-arm/usr/include/asm/types.h b/android-ndk-r7/platforms/android-9/arch-arm/usr/include/asm/types.h
index ec60f10..80cea8d 100644
--- a/android-ndk-r7/platforms/android-9/arch-arm/usr/include/asm/types.h
+++ b/android-ndk-r7/platforms/android-9/arch-arm/usr/include/asm/types.h
@@ -25,7 +25,7 @@ typedef unsigned short __u16;
typedef __signed__ int __s32;
typedef unsigned int __u32;
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#ifdef __GNUC__
typedef __signed__ long long __s64;
typedef unsigned long long __u64;
#endif
diff --git a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libEGL.so b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libEGL.so
index bc0e66e..5bd7f30 100755
--- a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libEGL.so
+++ b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libEGL.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libGLESv1_CM.so b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libGLESv1_CM.so
index 344c046..d8f9723 100755
--- a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libGLESv1_CM.so
+++ b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libGLESv1_CM.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libGLESv2.so b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libGLESv2.so
index 181df7a..ea4d19c 100755
--- a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libGLESv2.so
+++ b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libGLESv2.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libOpenSLES.so b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libOpenSLES.so
index 3efc100..af77566 100755
--- a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libOpenSLES.so
+++ b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libOpenSLES.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libandroid.so b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libandroid.so
index fd59a4d..a5f456b 100755
--- a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libandroid.so
+++ b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libandroid.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libc.so b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libc.so
index cca301b..d7aa49a 100755
--- a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libc.so
+++ b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libc.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libdl.so b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libdl.so
index df4a325..56e6674 100755
--- a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libdl.so
+++ b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libdl.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libjnigraphics.so b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libjnigraphics.so
index 0bc4b74..fbe903c 100755
--- a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libjnigraphics.so
+++ b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libjnigraphics.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/liblog.so b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/liblog.so
index 3c0ed1d..07e8250 100755
--- a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/liblog.so
+++ b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/liblog.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libm.so b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libm.so
index deda7d1..dec5dde 100755
--- a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libm.so
+++ b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libm.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libstdc++.so b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libstdc++.so
index f5a0775..b9f5e72 100755
--- a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libstdc++.so
+++ b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libstdc++.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libthread_db.so b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libthread_db.so
index 5104c2c..54b50c8 100755
--- a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libthread_db.so
+++ b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libthread_db.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libz.so b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libz.so
index beb6abe..9f8c193 100755
--- a/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libz.so
+++ b/android-ndk-r7/platforms/android-9/arch-arm/usr/lib/libz.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libEGL.so b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libEGL.so
index 5d5e317..dcde3c6 100755
--- a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libEGL.so
+++ b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libEGL.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libGLESv1_CM.so b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libGLESv1_CM.so
index bdf03df..4045443 100755
--- a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libGLESv1_CM.so
+++ b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libGLESv1_CM.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libGLESv2.so b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libGLESv2.so
index 7801167..a1e773c 100755
--- a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libGLESv2.so
+++ b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libGLESv2.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libOpenSLES.so b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libOpenSLES.so
index 6732436..cb55f5d 100755
--- a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libOpenSLES.so
+++ b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libOpenSLES.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libandroid.so b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libandroid.so
index 58dfe03..8e7db22 100755
--- a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libandroid.so
+++ b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libandroid.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libc.so b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libc.so
index 916150a..d052e6f 100755
--- a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libc.so
+++ b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libc.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libdl.so b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libdl.so
index 7915ad2..a334c3e 100755
--- a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libdl.so
+++ b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libdl.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libjnigraphics.so b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libjnigraphics.so
index 12581d7..b044e02 100755
--- a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libjnigraphics.so
+++ b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libjnigraphics.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/liblog.so b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/liblog.so
index d03a633..d9ce18e 100755
--- a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/liblog.so
+++ b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/liblog.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libm.so b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libm.so
index 160f7cd..cee4464 100755
--- a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libm.so
+++ b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libm.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libstdc++.so b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libstdc++.so
index d78aeec..12c0131 100755
--- a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libstdc++.so
+++ b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libstdc++.so
Binary files differ
diff --git a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libz.so b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libz.so
index c85e733..74c6b12 100755
--- a/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libz.so
+++ b/android-ndk-r7/platforms/android-9/arch-x86/usr/lib/libz.so
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_shared.so b/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_shared.so
index f60bf69..5329854 100755
--- a/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_shared.so
+++ b/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_shared.so
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_static.a b/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_static.a
index 6029db5..f498fda 100644
--- a/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_static.a
+++ b/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi-v7a/libgabi++_static.a
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_shared.so b/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_shared.so
index 3c2ef53..62035e6 100755
--- a/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_shared.so
+++ b/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_shared.so
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_static.a b/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_static.a
index 0cdcabd..a53ad35 100644
--- a/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_static.a
+++ b/android-ndk-r7/sources/cxx-stl/gabi++/libs/armeabi/libgabi++_static.a
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gabi++/libs/x86/libgabi++_shared.so b/android-ndk-r7/sources/cxx-stl/gabi++/libs/x86/libgabi++_shared.so
index 5eee9c7..84b1aef 100755
--- a/android-ndk-r7/sources/cxx-stl/gabi++/libs/x86/libgabi++_shared.so
+++ b/android-ndk-r7/sources/cxx-stl/gabi++/libs/x86/libgabi++_shared.so
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gabi++/libs/x86/libgabi++_static.a b/android-ndk-r7/sources/cxx-stl/gabi++/libs/x86/libgabi++_static.a
index fd0deb9..31e9011 100644
--- a/android-ndk-r7/sources/cxx-stl/gabi++/libs/x86/libgabi++_static.a
+++ b/android-ndk-r7/sources/cxx-stl/gabi++/libs/x86/libgabi++_static.a
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so
index 39c6bbb..dbb10fb 100755
--- a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so
+++ b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_static.a b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_static.a
index 8447c05..538df34 100644
--- a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_static.a
+++ b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_static.a
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libsupc++.a b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libsupc++.a
index 8d18d2b..e582ce6 100644
--- a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libsupc++.a
+++ b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libsupc++.a
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_shared.so b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_shared.so
index 2666669..5ec09ea 100755
--- a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_shared.so
+++ b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_shared.so
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_static.a b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_static.a
index 0870825..1bb2f47 100644
--- a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_static.a
+++ b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libgnustl_static.a
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libsupc++.a b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libsupc++.a
index ee9d588..8e4c3ac 100644
--- a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libsupc++.a
+++ b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libsupc++.a
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_shared.so b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_shared.so
index d6e3601..bff0e70 100755
--- a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_shared.so
+++ b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_shared.so
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_static.a b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_static.a
index 8823434..0af31a1 100644
--- a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_static.a
+++ b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libgnustl_static.a
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libsupc++.a b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libsupc++.a
index f84c363..6676dcf 100644
--- a/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libsupc++.a
+++ b/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/x86/libsupc++.a
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_shared.so b/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_shared.so
index a08da4a..ad28af1 100755
--- a/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_shared.so
+++ b/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_shared.so
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_static.a b/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_static.a
index 1f276f3..b9b06cd 100644
--- a/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_static.a
+++ b/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_static.a
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so b/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so
index 40e8eef..be2c880 100755
--- a/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so
+++ b/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi/libstlport_shared.so
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi/libstlport_static.a b/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi/libstlport_static.a
index f719abf..a7c8663 100644
--- a/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi/libstlport_static.a
+++ b/android-ndk-r7/sources/cxx-stl/stlport/libs/armeabi/libstlport_static.a
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/stlport/libs/x86/libstlport_shared.so b/android-ndk-r7/sources/cxx-stl/stlport/libs/x86/libstlport_shared.so
index b4ccb69..dad4a7d 100755
--- a/android-ndk-r7/sources/cxx-stl/stlport/libs/x86/libstlport_shared.so
+++ b/android-ndk-r7/sources/cxx-stl/stlport/libs/x86/libstlport_shared.so
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/stlport/libs/x86/libstlport_static.a b/android-ndk-r7/sources/cxx-stl/stlport/libs/x86/libstlport_static.a
index 27f4b04..4c3b988 100644
--- a/android-ndk-r7/sources/cxx-stl/stlport/libs/x86/libstlport_static.a
+++ b/android-ndk-r7/sources/cxx-stl/stlport/libs/x86/libstlport_static.a
Binary files differ
diff --git a/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_cmath.h b/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_cmath.h
index 2867c23..5cb0cd5 100644
--- a/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_cmath.h
+++ b/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_cmath.h
@@ -531,7 +531,7 @@ _STLP_DEF_MATH_INLINE2(hypot, _hypot)
#endif
#if defined (_STLP_IMPORT_VENDOR_CSTD) && !defined (_STLP_NO_CSTD_FUNCTION_IMPORTS)
-#if defined (ANDROID)
+#if defined (__ANDROID__)
namespace __captured {
template<typename _Tp> inline int __capture_isfinite(_Tp __f) { return isfinite(__f); }
template<typename _Tp> inline int __capture_isinf(_Tp __f) { return isinf(__f); }
@@ -573,7 +573,7 @@ using ::frexp;
#if !(defined(__HP_aCC) && defined(_STLP_DEBUG))
using ::hypot;
#endif
-#if defined (ANDROID)
+#if defined (__ANDROID__)
using __captured::isfinite;
using __captured::isinf;
using __captured::isnan;
@@ -583,7 +583,7 @@ using ::log;
using ::log10;
using ::modf;
using ::pow;
-#if defined (ANDROID)
+#if defined (__ANDROID__)
using __captured::signbit;
#endif
using ::sin;
diff --git a/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_mbstate_t.h b/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_mbstate_t.h
index 53566a7..83f085e 100644
--- a/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_mbstate_t.h
+++ b/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_mbstate_t.h
@@ -27,7 +27,7 @@
#if defined (_STLP_USE_OWN_MBSTATE_T)
# if !defined (_STLP_CPP_MBSTATE_T) || !defined (__cplusplus) || !defined (_STLP_USE_NEW_C_HEADERS)
-# if !defined (ANDROID) /* mbstate_t conflicts with Android's definition */
+# if !defined (__ANDROID__) /* mbstate_t conflicts with Android's definition */
typedef int mbstate_t;
# endif
# endif
diff --git a/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_pair.h b/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_pair.h
index de0b08e..7da76a9 100644
--- a/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_pair.h
+++ b/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/_pair.h
@@ -43,7 +43,7 @@
_STLP_BEGIN_NAMESPACE
-#if defined (ANDROID)
+#if defined (__ANDROID__)
/* Android has stl_pair.h, prevent using it by defining the header guard. */
# define __SGI_STL_INTERNAL_PAIR_H
#endif
diff --git a/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/config/_system.h b/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/config/_system.h
index c0b4add..1e82095 100644
--- a/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/config/_system.h
+++ b/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/config/_system.h
@@ -59,7 +59,7 @@
# elif defined (__HP_aCC)
# include <stl/config/_hpacc.h>
# endif
-#elif defined (ANDROID)
+#elif defined (__ANDROID__)
/* Android mobile phone platform. Somewhat but not entirely GNU/Linux-like */
# include <stl/config/_android.h>
#elif defined (linux) || defined (__linux__)
diff --git a/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/pointers/_tools.h b/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/pointers/_tools.h
index ec94806..5bb7b25 100644
--- a/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/pointers/_tools.h
+++ b/android-ndk-r7/sources/cxx-stl/stlport/stlport/stl/pointers/_tools.h
@@ -90,8 +90,8 @@ template <class _Tp>
struct _StorageType<_Tp*> {
// Even if we detect a pointer type we use dispatch function to consider if it can be stored as a void*.
// For instance function pointer might not necessarily be convertible to void*.
- enum { use_void_ptr = (sizeof(_UseVoidPtrStorageType(__true_type(),
- __STATIC_CAST(_Tp*, 0))) == sizeof(char*)) };
+ enum { use_void_ptr = (sizeof(_STLP_PRIV _UseVoidPtrStorageType(__true_type(),
+ __STATIC_CAST(_Tp*, 0))) == sizeof(char*)) };
enum { use_const_volatile_void_ptr = use_void_ptr };
typedef typename __select<use_void_ptr,
void*,
@@ -101,8 +101,8 @@ struct _StorageType<_Tp*> {
template <class _Tp>
struct _StorageType<_Tp const*> {
- enum { use_void_ptr = (sizeof(_UseConstVoidPtrStorageType(__true_type(),
- __STATIC_CAST(const _Tp*, 0))) == sizeof(char*)) };
+ enum { use_void_ptr = (sizeof(_STLP_PRIV _UseConstVoidPtrStorageType(__true_type(),
+ __STATIC_CAST(const _Tp*, 0))) == sizeof(char*)) };
enum { use_const_volatile_void_ptr = use_void_ptr };
typedef typename __select<use_void_ptr,
const void*,
@@ -114,8 +114,8 @@ struct _StorageType<_Tp const*> {
template <class _Tp>
struct _StorageType<_Tp volatile*> {
- enum { use_void_ptr = (sizeof(_UseVolatileVoidPtrStorageType(__true_type(),
- __STATIC_CAST(_Tp volatile*, 0))) == sizeof(char*)) };
+ enum { use_void_ptr = (sizeof(_STLP_PRIV _UseVolatileVoidPtrStorageType(__true_type(),
+ __STATIC_CAST(_Tp volatile*, 0))) == sizeof(char*)) };
enum { use_const_volatile_void_ptr = use_void_ptr };
typedef typename __select<use_void_ptr,
volatile void*,
@@ -127,8 +127,8 @@ struct _StorageType<_Tp volatile*> {
template <class _Tp>
struct _StorageType<_Tp const volatile*> {
- enum { use_void_ptr = (sizeof(_UseConstVolatileVoidPtrStorageType(__true_type(),
- __STATIC_CAST(_Tp const volatile*, 0))) == sizeof(char*)) };
+ enum { use_void_ptr = (sizeof(_STLP_PRIV _UseConstVolatileVoidPtrStorageType(__true_type(),
+ __STATIC_CAST(_Tp const volatile*, 0))) == sizeof(char*)) };
enum { use_const_volatile_void_ptr = use_void_ptr };
typedef typename __select<use_void_ptr,
const volatile void*,
@@ -147,10 +147,10 @@ struct _StorageType {
#else
static _Tp __null_rep;
#endif
- enum { use_void_ptr = (sizeof(_UseVoidPtrStorageType(_PODType(), __null_rep())) == sizeof(char*)) };
- enum { use_const_void_ptr = (sizeof(_UseConstVoidPtrStorageType(_PODType(), __null_rep())) == sizeof(char*)) };
- enum { use_volatile_void_ptr = (sizeof(_UseVolatileVoidPtrStorageType(_PODType(), __null_rep())) == sizeof(char*)) };
- enum { use_const_volatile_void_ptr = (sizeof(_UseConstVolatileVoidPtrStorageType(_PODType(), __null_rep())) == sizeof(char*)) };
+ enum { use_void_ptr = (sizeof(_STLP_PRIV _UseVoidPtrStorageType(_PODType(), __null_rep())) == sizeof(char*)) };
+ enum { use_const_void_ptr = (sizeof(_STLP_PRIV _UseConstVoidPtrStorageType(_PODType(), __null_rep())) == sizeof(char*)) };
+ enum { use_volatile_void_ptr = (sizeof(_STLP_PRIV _UseVolatileVoidPtrStorageType(_PODType(), __null_rep())) == sizeof(char*)) };
+ enum { use_const_volatile_void_ptr = (sizeof(_STLP_PRIV _UseConstVolatileVoidPtrStorageType(_PODType(), __null_rep())) == sizeof(char*)) };
typedef typename __select<!use_const_volatile_void_ptr,
_Tp,