Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36756947 authored by David Friedman's avatar David Friedman Committed by Android Git Automerger
Browse files

am c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted... 

am c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs

* commit 'c397dde1':
  Docs: A few minor corrections: deleted obsolete sentences, fixed references.
parents a9ac8354 c397dde1

docs/html-ndk/ndk/guides/abis.jd

+1 −1
Original line number Diff line number Diff line
@@ -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

docs/html-ndk/ndk/guides/android_mk.jd

+1 −1
Original line number Diff line number Diff line
@@ -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

docs/html-ndk/ndk/guides/ndk-build.jd

+2 −4
Original line number Diff line number Diff line
@@ -46,10 +46,8 @@ $ &lt;ndk&gt;/ndk-build 


<p>In this example, <code>&lt;project&gt;</code> points to your

project’s root directory, and <code>&lt;ndk&gt;</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}

docs/html-ndk/ndk/guides/standalone_toolchain.jd

+1 −1
Original line number Diff line number Diff line
@@ -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>