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

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

am 95af201a: am 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one...

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

* commit '95af201a':
  Docs: Corrects technical content of one sentence, and deletes another.
parents 0ca15144 95af201a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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>

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