diff options
| author | 2010-05-14 13:45:17 -0700 | |
|---|---|---|
| committer | 2010-05-14 13:45:17 -0700 | |
| commit | cae9cfeed7b0895189e08a4fadf63c917b1aec7b (patch) | |
| tree | e1ea681c757f8cf1ea7992af60a077db7b5f0f1e | |
| parent | bf4cecd2822ff74c8c246d2595a836b5f1130ad8 (diff) | |
| parent | bba70cdba284c3d76cab9843e44097d664882938 (diff) | |
am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
Merge commit 'bba70cdba284c3d76cab9843e44097d664882938' into froyo-plus-aosp
* commit 'bba70cdba284c3d76cab9843e44097d664882938':
Doc change: add note about future instruction set support.
| -rw-r--r-- | docs/html/sdk/ndk/index.jd | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/docs/html/sdk/ndk/index.jd b/docs/html/sdk/ndk/index.jd index 3dfeedfe0cd6..361da429d6c0 100644 --- a/docs/html/sdk/ndk/index.jd +++ b/docs/html/sdk/ndk/index.jd @@ -27,7 +27,7 @@ function toggleDiv(link) { //$(".toggleme", toggleable).slideDown("fast"); toggleable.removeClass("closed"); toggleable.addClass("open"); - $(".toggle-img", toggleable).attr("title", "hide").attr("src", "/assets/images/triangle-opened.png"); + $(".toggle-img", toggleable).attr("title", "hide").attr("src", "{@docRoot}assets/images/triangle-opened.png"); } else { //$(".toggleme", toggleable).slideUp("fast"); toggleable.removeClass("open"); @@ -208,6 +208,12 @@ future versions of the Android platform, starting from Android 1.5 </li> optional support for NEON/VFPv3-D32 instructions)</li> </ul> +<p>Future releases of the NDK will also support:</p> + +<ul> +<li>x86 instructions (see CPU-ARCH-ABIS.TXT for more information)</li> +</ul> + <p>ARMv5TE machine code will run on all ARM-based Android devices. ARMv7-A will run only on devices such as the Verizon Droid or Google Nexus One that have a compatible CPU. The main difference between the two instruction sets is that @@ -216,7 +222,7 @@ either or both of the instruction sets — ARMv5TE is the default, but switching to ARMv7-A is as easy as adding a single line to the application's Application.mk file, without needing to change anything else in the file. You can also build for both architectures at the same time and have everything -stored in the final <code>.apk</code>. Complete information is provided in the +stored in the final <code>.apk</code>. For complete information is provided in the CPU-ARCH-ABIS.TXT in the NDK package. </p> <p>The NDK provides stable headers for libc (the C library), libm (the Math |