diff --git a/docs/html/sdk/ndk/index.jd b/docs/html/sdk/ndk/index.jd
index afbad57094d0a..29f0749736fd3 100644
--- a/docs/html/sdk/ndk/index.jd
+++ b/docs/html/sdk/ndk/index.jd
@@ -1,16 +1,16 @@
ndk=true
-ndk.win_download=android-ndk-r7-windows.zip
-ndk.win_bytes=81270552
-ndk.win_checksum=55483482cf2b75e8dd1a5d9a7caeb6e5
+ndk.win_download=android-ndk-r7b-windows.zip
+ndk.win_bytes=80346206
+ndk.win_checksum=c42b0c9c14428397337421d5e4999380
-ndk.mac_download=android-ndk-r7-darwin-x86.tar.bz2
-ndk.mac_bytes=71262092
-ndk.mac_checksum=817ca5675a1dd44078098e43070f19b6
+ndk.mac_download=android-ndk-r7b-darwin-x86.tar.bz2
+ndk.mac_bytes=73817184
+ndk.mac_checksum=6daa82ca6b73bc0614c9997430079c7a
-ndk.linux_download=android-ndk-r7-linux-x86.tar.bz2
-ndk.linux_bytes=64884365
-ndk.linux_checksum=bf15e6b47bf50824c4b96849bf003ca3
+ndk.linux_download=android-ndk-r7b-linux-x86.tar.bz2
+ndk.linux_bytes=64349733
+ndk.linux_checksum=0eb8af18796cdaa082df8f7c54ad7f9a
page.title=Android NDK
@@ -62,6 +62,116 @@ padding: .25em 1em;
+ Android NDK, Revision 7b (February 2012)
+
+
+
This release of the NDK includes fixes for native Windows builds, Cygwin and many other
+ improvements:
+
+
+ - Important bug fixes:
+
+ -
+
+
+
+
+
+ - Other changes:
+
+ -
+
+ - When your application uses the GNU {@code libstdc++} runtime, the compiler will
+ no longer forcibly enable exceptions and RTTI. This change results in smaller code.
+
If you need these features, you must do one of the following:
+
+ - Enable exceptions and/or RTTI explicitly in your modules or
+ {@code Application.mk}. (recommended)
+ - Define {@code APP_GNUSTL_FORCE_CPP_FEATURES} to {@code 'exceptions'},
+ {@code 'rtti'} or both in your {@code Application.mk}. See
+ {@code docs/APPLICATION-MK.html} for more details.
+
+
+ - {@code ndk-gdb} now works properly when your application has private services
+ running in independent processes. It debugs the main application process, instead of the
+ first process listed by {@code ps}, which is usually a service process.
+ - Fixed a rare bug where NDK r7 would fail to honor the {@code LOCAL_ARM_MODE} value
+ and always compile certain source files (but not all) to 32-bit instructions.
+ - {@code stlport}: Refresh the sources to match the Android platform version. This
+ update fixes a few minor bugs:
+
+ - Fixed instantiation of an incomplete type
+ - Fixed minor "==" versus "=" typo
+ - Used {@code memmove} instead of {@code memcpy} in {@code string::assign}
+ - Added better handling of {@code IsNANorINF}, {@code IsINF}, {@code IsNegNAN},
+ etc.
+
+ For complete details, see the commit log.
+
+ - {@code stlport}: Removed 5 unnecessary static initializers from the library.
+ - The GNU libstdc++ libraries for armeabi-v7a were mistakenly compiled for
+ armeabi instead. This change had no impact on correctness, but using the right
+ ABI should provide slightly better performance.
+ - The {@code cpu-features} helper library was updated to report three optional
+ x86 CPU features ({@code SSSE3}, {@code MOVBE} and {@code POPCNT}). See
+ {@code docs/CPU-FEATURES.html} for more details.
+ - {@code docs/NDK-BUILD.html} was updated to mention {@code NDK_APPLICATION_MK} instead
+ of {@code NDK_APP_APPLICATION_MK} to select a custom {@code Application.mk} file.
+ - Cygwin: {@code ndk-build} no longer creates an empty "NUL" file in the current
+ directory when invoked.
+ - Cygwin: Added better automatic dependency detection. In the previous version, it
+ didn't work properly in the following cases:
+
+ - When the Cygwin drive prefix was not {@code /cygdrive}.
+ - When using drive-less mounts, for example, when Cygwin would translate
+ {@code /home} to {@code \\server\subdir} instead of {@code C:\Some\Dir}.
+
+
+ - Cygwin: {@code ndk-build} does not try to use the native Windows tools under
+ {@code $NDK/prebuilt/windows/bin} with certain versions of Cygwin and/or GNU Make.
+
+
+
+
+
+
+
+
+
Android NDK, Revision 7 (November 2011)
diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs
index 0de477a25dfa2..f7541f7167e55 100644
--- a/docs/html/sdk/sdk_toc.cs
+++ b/docs/html/sdk/sdk_toc.cs
@@ -195,7 +195,7 @@ class="new">new!