From 10a36020e3d37ef088f5f7ed6d64ba35847fc069 Mon Sep 17 00:00:00 2001 From: Robert Ly Date: Thu, 23 Jun 2011 11:47:37 -0700 Subject: [PATCH] cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a Change-Id: I4cb22b628978c86b5c07ff80b2fe8547e25015a1 --- docs/html/sdk/ndk/index.jd | 70 ++++++++++++++++++++++++++++++----- docs/html/sdk/ndk/overview.jd | 4 -- docs/html/sdk/sdk_toc.cs | 2 +- 3 files changed, 62 insertions(+), 14 deletions(-) diff --git a/docs/html/sdk/ndk/index.jd b/docs/html/sdk/ndk/index.jd index e980ca5261d22..97df84f1df49e 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-r5c-windows.zip -ndk.win_bytes=61627716 -ndk.win_checksum=2c7423842fa0f46871eab118495d4b45 +ndk.win_download=android-ndk-r6-windows.zip +ndk.win_bytes=67642809 +ndk.win_checksum=9c7d5ccc02151a3e5e950c70dc05ac6d -ndk.mac_download=android-ndk-r5c-darwin-x86.tar.bz2 -ndk.mac_bytes=50714712 -ndk.mac_checksum=183bfbbd85cf8e4c0bd7531e8803e75d +ndk.mac_download=android-ndk-r6-darwin-x86.tar.bz2 +ndk.mac_bytes=52682746 +ndk.mac_checksum=a154905e49a6246abd823b75b6eda738 -ndk.linux_download=android-ndk-r5c-linux-x86.tar.bz2 -ndk.linux_bytes=44539890 -ndk.linux_checksum=7659dfdc97026ed1d913e224d0531f61 +ndk.linux_download=android-ndk-r6-linux-x86.tar.bz2 +ndk.linux_bytes=46425290 +ndk.linux_checksum=ff0a43085fe206696d5cdcef3f4f4637 page.title=Android NDK @jd:body @@ -62,6 +62,58 @@ padding: .25em 1em;
+ Android NDK, Revision 6 (July 2011) + +
+

This release of the NDK includes support for the x86 ABI and other minor changes. + For detailed information describing the changes in this release, read the + CHANGES.HTML document included in the NDK package. +

+
+
General notes:
+
+
    +
  • Adds support for the x86 ABI, which allows you to generate machine code + that runs on compatible x86-based Android devices. Major features for x86 + include x86-specific toolchains, system headers, libraries and + debugging support. For all of the details regarding x86 support, + see docs/CPU-X86.html in the NDK package. + +

    By default, code is generated for ARM-based devices, but you can add x86 to your + APP_ABI definition in your Application.mk file to build + for x86 platforms. For example, the following line instructs ndk-build + to build your code for three distinct ABIs:

    + + 
    APP_ABI := armeabi armeabi-v7a x86
    + +

    Unless you rely on ARM-based assembly sources, you shouldn't need to touch + your Android.mk files to build x86 machine code.

    + +
    • + +
  • You can build a standalone x86 toolchain using the --toolchain=x86-4.4.3 + option when calling make-standalone-toolchain.sh. See + docs/STANDALONE-TOOLCHAIN.html for more details. +
    • +
  • The new ndk-stack tool lets you translate stack traces in + logcat that are generated by native code. The tool translates + instruction addresses into a readable format that contains things such + as the function, source file, and line number corresponding to each stack frame. + For more information and a usage example, see docs/NDK-STACK.html. +
    • +
+
+
Other changes:
+
arm-eabi-4.4.0, which had been deprecated since NDK r5, has been + removed from the NDK distribution.
+ +
+
+
+ +
+ Android NDK, Revision 5c (June 2011)
diff --git a/docs/html/sdk/ndk/overview.jd b/docs/html/sdk/ndk/overview.jd index 2562a25e9688d..93c664dac5a44 100644 --- a/docs/html/sdk/ndk/overview.jd +++ b/docs/html/sdk/ndk/overview.jd @@ -53,11 +53,7 @@ page.title=What is the NDK?
  • ARMv7-A (including Thumb-2 and VFPv3-D16 instructions, with optional support for NEON/VFPv3-D32 instructions)
    • - -

    Future releases of the NDK will also support:

    - -
    • x86 instructions (see CPU-ARCH-ABIS.HTML for more information)
    diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs index 0607aad54633a..1f3f1c08d5fdf 100644 --- a/docs/html/sdk/sdk_toc.cs +++ b/docs/html/sdk/sdk_toc.cs @@ -175,7 +175,7 @@ class="new">new!