summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-05-13 22:19:10 -0700
committerDirk Dougherty <ddougherty@google.com>2010-05-14 13:37:01 -0700
commitde98f6e39788b929f28dd44a55c2ffb48d59f32d (patch)
tree30a4638a833d6a4b5f3f4a0102146c48f6cc7ad8 /docs
parentfb473bb6118f6b82fdeda443b4fdc4ce31d3ed60 (diff)
downloadframeworks_base-de98f6e39788b929f28dd44a55c2ffb48d59f32d.zip
frameworks_base-de98f6e39788b929f28dd44a55c2ffb48d59f32d.tar.gz
frameworks_base-de98f6e39788b929f28dd44a55c2ffb48d59f32d.tar.bz2
Doc change: add note about future instruction set support.
Change-Id: If954c1020301f5935c8d9328a531afdddbdad8db
Diffstat (limited to 'docs')
-rw-r--r--docs/html/sdk/ndk/index.jd10
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 &mdash; 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