diff options
| author | David Friedman <dmail@google.com> | 2015-05-28 22:54:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-28 22:54:29 +0000 |
| commit | 3675694775d69712a2c9d5ee1d39dd2a5127cc86 (patch) | |
| tree | 18abbd41bae46b03b2a47a2f7b8e82462bfd2519 | |
| parent | a9ac835437f45c7f7f3fc53f56aec2d53390fa72 (diff) | |
| parent | c397dde17960f2308ecc3ef0b5143c95df8e160c (diff) | |
| download | frameworks_base-3675694775d69712a2c9d5ee1d39dd2a5127cc86.zip frameworks_base-3675694775d69712a2c9d5ee1d39dd2a5127cc86.tar.gz frameworks_base-3675694775d69712a2c9d5ee1d39dd2a5127cc86.tar.bz2 | |
am c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
* commit 'c397dde17960f2308ecc3ef0b5143c95df8e160c':
Docs: A few minor corrections: deleted obsolete sentences, fixed references.
| -rw-r--r-- | docs/html-ndk/ndk/guides/abis.jd | 2 | ||||
| -rw-r--r-- | docs/html-ndk/ndk/guides/android_mk.jd | 2 | ||||
| -rw-r--r-- | docs/html-ndk/ndk/guides/ndk-build.jd | 6 | ||||
| -rw-r--r-- | docs/html-ndk/ndk/guides/standalone_toolchain.jd | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/docs/html-ndk/ndk/guides/abis.jd b/docs/html-ndk/ndk/guides/abis.jd index ee55898..f4819b2 100644 --- a/docs/html-ndk/ndk/guides/abis.jd +++ b/docs/html-ndk/ndk/guides/abis.jd @@ -373,7 +373,7 @@ further information <h3 id="mips64">mips64</h3> <p>This ABI is for MIPS64 R6. For more information, see -<a href="http://www.imgtec.com/mips/architectures/mips64.asp">MIPS Architecture</a>.</p> +<a href="http://www.imgtec.com/mips/architectures/mips64.asp">MIPS64 Architecture</a>.</p> <h2 id="gc">Generating Code for a Specific ABI</h2> <p>By default, the NDK generates machine code for the armeabi ABI. You can diff --git a/docs/html-ndk/ndk/guides/android_mk.jd b/docs/html-ndk/ndk/guides/android_mk.jd index 9c3c0ec..47fefc3 100644 --- a/docs/html-ndk/ndk/guides/android_mk.jd +++ b/docs/html-ndk/ndk/guides/android_mk.jd @@ -217,7 +217,7 @@ The following example shows the syntax for using this variable:</p> TARGET_PLATFORM := android-22 </pre> -<h4>TARGET_ARCH_ABI</h4> +<h4 id="taa">TARGET_ARCH_ABI</h4> <p>This variable stores the name of the CPU and architecture to target when the build system parses this {@code Android.mk} file. You can specify one or more of the following values, using a space as a delimiter between multiple targets. Table 1 shows the ABI setting to use for each diff --git a/docs/html-ndk/ndk/guides/ndk-build.jd b/docs/html-ndk/ndk/guides/ndk-build.jd index 9e3edda..18ca2d8 100644 --- a/docs/html-ndk/ndk/guides/ndk-build.jd +++ b/docs/html-ndk/ndk/guides/ndk-build.jd @@ -46,10 +46,8 @@ $ <ndk>/ndk-build <p>In this example, <code><project></code> points to your project’s root directory, and <code><ndk></code> is the directory where -you installed the NDK. As noted in <a -href="{@docRoot}ndk/guides/setup.html#install">Setup</a>, you can add {@code $NDK} to your -{@code PATH} to avoid having to type the whole filepath every time you use ndk-build. -Alternatively, you can create an alias.</p> +you installed the NDK.</p> + <p><a class="anchor" id="options"></a> </p> <h3>Options</h3> <p>All parameters to ndk-build are passed directly to the underlying GNU {@code make} diff --git a/docs/html-ndk/ndk/guides/standalone_toolchain.jd b/docs/html-ndk/ndk/guides/standalone_toolchain.jd index 895f0fc..3b6f7f1 100644 --- a/docs/html-ndk/ndk/guides/standalone_toolchain.jd +++ b/docs/html-ndk/ndk/guides/standalone_toolchain.jd @@ -485,7 +485,7 @@ NEON functions.</p> <p>You don't have to use any specific compiler flag when targeting the MIPS ABI.</p> -<p>To learn more about ABI support, see <a href="{@docRoot}ndk/guides/x86.html">x86</a>.</p> +<p>To learn more about ABI support, see <a href="{@docRoot}ndk/guides/x86.html">x86 Support</a>.</p> <h2 id="war">Warnings and Limitations</h2> <h3>Windows support</h3> |