Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another.

Browse Source 
* commit '90042a5f8c987582736f4eed714aeba9416003c6':
  Docs: Corrects technical content of one sentence, and deletes another.
This commit is contained in:
David Friedman
2015-05-29 05:31:56 +00:00
committed by Android Git Automerger
parent 2f85475c18 90042a5f8c
commit 2ed3a89c1b
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/html-ndk/ndk/guides/application_mk.jd
View File

@@ -12,7 +12,7 @@ page.title=Application.mk
</div> </div>
</div> </div>
<p>This document explains the syntax of the {@code Application.mk} build file, which describes the <p>This document explains the {@code Application.mk} build file, which describes the
native <em>modules</em> that your app requires. A module can be a static library, a shared library, native <em>modules</em> that your app requires. A module can be a static library, a shared library,
or an executable.</p> or an executable.</p>

20
docs/html-ndk/ndk/guides/concepts.jd
View File

@@ -115,20 +115,22 @@ ARMEABI (default), MIPS, and x86. For more information, see
</li> </li>
</ul> </ul>
<p>The following two items only apply in cases in which you are using the toolchains provided with <p>The following two items are only required for building using the
the Android NDK as standalone compilers.</p> <a href="{@docRoot}ndk/guides/ndk-build.html">{@code ndk-build}</a> script,
and for debugging using the <a href="{@docRoot}ndk/guides/ndk-gdb.html">
{@code ndk-gdb}</a> script.
<ul> <ul>
<li>{@code Android.mk}: You must create an <a href="{@docRoot}ndk/guides/android_mk.html"> <li><a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a>:
{@code Android.mk}</a> configuration file inside your {@code jni} folder. The ndk-build script You must create an <a href="{@docRoot}ndk/guides/android_mk.html">
looks at this file, which defines the module and its name, the source files to be compiled, build {@code Android.mk}</a> configuration file inside your {@code jni} folder. The {@code ndk-build}
flags and libraries to link.</li> script looks at this file, which defines the module and its name, the source files to be compiled,
build flags and libraries to link.</li>
</ul> </ul>
<ul> <ul>
<li>{@code Application.mk}: You may optionally create an <li><a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a>: This file
<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file. This file enumerates and describes the modules that your app requires. This information includes:
This file enumerates and describes the modules that your app requires. This information includes:
<ul> <ul>
<li>ABIs used to compile for specific platforms.</li> <li>ABIs used to compile for specific platforms.</li>