summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Friedman <dmail@google.com> 2015-05-29 05:31:56 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-05-29 05:31:56 +0000
commit2ed3a89c1b6c57b45b08ab9e6bcf29c33d82cdd2 (patch)
treee216837110aceb1d31f486bf29c90c4013756ebb
parent2f85475c18d68d8719f20e4385dccb3ba0117d1a (diff)
parent90042a5f8c987582736f4eed714aeba9416003c6 (diff)
am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another.
* commit '90042a5f8c987582736f4eed714aeba9416003c6': Docs: Corrects technical content of one sentence, and deletes another.
-rw-r--r--docs/html-ndk/ndk/guides/application_mk.jd2
-rw-r--r--docs/html-ndk/ndk/guides/concepts.jd20
2 files changed, 12 insertions, 10 deletions
diff --git a/docs/html-ndk/ndk/guides/application_mk.jd b/docs/html-ndk/ndk/guides/application_mk.jd
index fab611b3ca55..1294687299e2 100644
--- a/docs/html-ndk/ndk/guides/application_mk.jd
+++ b/docs/html-ndk/ndk/guides/application_mk.jd
@@ -12,7 +12,7 @@ page.title=Application.mk
</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,
or an executable.</p>
diff --git a/docs/html-ndk/ndk/guides/concepts.jd b/docs/html-ndk/ndk/guides/concepts.jd
index c2eccd4bd18e..0601f212e230 100644
--- a/docs/html-ndk/ndk/guides/concepts.jd
+++ b/docs/html-ndk/ndk/guides/concepts.jd
@@ -115,20 +115,22 @@ ARMEABI (default), MIPS, and x86. For more information, see
</li>
</ul>
-<p>The following two items only apply in cases in which you are using the toolchains provided with
-the Android NDK as standalone compilers.</p>
+<p>The following two items are only required for building using the
+<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>
-<li>{@code Android.mk}: You must create an <a href="{@docRoot}ndk/guides/android_mk.html">
-{@code Android.mk}</a> configuration file inside your {@code jni} folder. The ndk-build 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>
+<li><a href="{@docRoot}ndk/guides/android_mk.html">{@code Android.mk}</a>:
+You must create an <a href="{@docRoot}ndk/guides/android_mk.html">
+{@code Android.mk}</a> configuration file inside your {@code jni} folder. The {@code ndk-build}
+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>
-<li>{@code Application.mk}: You may optionally create an
-<a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a> file. This file
-This file enumerates and describes the modules that your app requires. This information includes:
+<li><a href="{@docRoot}ndk/guides/application_mk.html">{@code Application.mk}</a>: This file
+enumerates and describes the modules that your app requires. This information includes:
<ul>
<li>ABIs used to compile for specific platforms.</li>