diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-05-14 13:43:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-14 13:43:19 -0700 |
| commit | bba70cdba284c3d76cab9843e44097d664882938 (patch) | |
| tree | 05e012a445599871ab3ed05c5e92b2b7c458bc8a /docs/html | |
| parent | 89969d4cdaf7abbbf6d3fce86c274e7b79113e8d (diff) | |
| parent | de98f6e39788b929f28dd44a55c2ffb48d59f32d (diff) | |
| download | frameworks_base-bba70cdba284c3d76cab9843e44097d664882938.zip frameworks_base-bba70cdba284c3d76cab9843e44097d664882938.tar.gz frameworks_base-bba70cdba284c3d76cab9843e44097d664882938.tar.bz2 | |
Merge "Doc change: add note about future instruction set support." into froyo
Diffstat (limited to 'docs/html')
| -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 3dfeedf..361da42 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 |