Merge "Several ndk documentation updates."
diff --git a/docs/CPU-ARCH-ABIS.html b/docs/CPU-ARCH-ABIS.html
index 8e87649..e865b38 100644
--- a/docs/CPU-ARCH-ABIS.html
+++ b/docs/CPU-ARCH-ABIS.html
@@ -219,7 +219,8 @@
APP_ABI := armeabi-v7a
-It is also possible to build machine code for *two* distinct ABIs by using:
+It is also possible to build machine code for two or more distinct ABIs,
+for example:
APP_ABI := armeabi armeabi-v7a
@@ -232,6 +233,14 @@
package manager will only unpack the most appropriate machine code for the
target device. See below for details.
+Also you can use:
+
+ APP_ABI := all
+
+which will generate machine code for all supported ABIs with this NDK. Doing so
+will ensure that your application package contains libraries for all target ABIs.
+Note that this has an impact on package size, since each ABI will correspond to
+its own set of native libraries built from the same sources.
III. ABI Management on the Android platform:
@@ -288,6 +297,9 @@
- an optional 'secondary' ABI, corresponding to another ABI that
is also supported by the system image.
+ To achieve the best performance for your NDK component, you should compile
+ directly for the primary ABI.
+
For example, a typical ARMv5TE-based device would only define
the primary ABI as 'armeabi' and not define a secondary one.
@@ -296,7 +308,9 @@
since it can run application native binaries generated for both
of them.
- A typical x86-based device only defines a primary abi named 'x86'.
+ Many x86-based devices can also run armeabi-v7a and armeabi NDK
+ binaries and define the primary ABI to 'x86' and the secondary
+ one to 'armeabi-v7a'.
A typical MIPS-based device only defines a primary abi named 'mips'.
diff --git a/docs/CPU-X86.html b/docs/CPU-X86.html
index 3d811d1..5dcdeda 100644
--- a/docs/CPU-X86.html
+++ b/docs/CPU-X86.html
@@ -37,7 +37,7 @@
to put them under <dataPath>/lib, where <dataPath> is the
application's private data directory.
-Similarly, the Android Market server is capable of filtering applications
+Similarly, the Google Play server is capable of filtering applications
based on the native libraries they embed and your device's target CPU.
Debugging with ndk-gdb should work exactly as described under docs/NDK-GDB.html.
@@ -64,12 +64,4 @@
You won't have to change anything to your project files if you target an older
API level: the NDK build script will automatically select the right set of
native platform headers/libraries for you.
-
-Note that, as of today (June 2011), *no* compatible x86 devices exist on the
-market.
-
-In particular, while there are various projects which have forked the
-official Android open-source tree and added their own x86-specific
-customizations, there is absolutely no guarantee that anything generated
-with the official Android NDK is going to run on them at the moment.
</pre></body></html>
