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

Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs

Browse Source
This commit is contained in:
David Friedman
2015-05-28 21:58:57 +00:00
committed by Android (Google) Code Review
parent dcfa755616 9f33a25749
commit ed8c62955a
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/html-ndk/ndk/guides/android_mk.jd
View File

@@ -114,7 +114,7 @@ script determines what to build, and how to do it.</p>
<p>There are more complex examples in the samples directories, with commented
{@code Android.mk} files that you can look at. In addition,
<a href="{@docRoot}ndk/guides/sample_na.html">Sample: native-activity</a> provides
<a href="{@docRoot}ndk/samples/sample_na.html">Sample: native-activity</a> provides
a detailed explanation of that sample's {@code Android.mk} file. Finally, <a href="#var">
Variables and Macros</a> provides further information on the variables from this section.
@@ -872,7 +872,4 @@ $(call import-module,&lt;name&gt;)
<p>In this example, the build system looks for the module tagged {@code &lt;name&gt;} in the list of
directories referenced that your {@code NDK_MODULE_PATH} environment variable references, and
includes its {@code Android.mk} file automatically for you.</p>
<p>For more information, see <a href="import.html">Android Module Paths (Sharing Code)</a>.
</p>
includes its {@code Android.mk} file automatically for you.</p>

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

@@ -39,7 +39,7 @@ use cases for this functionality:</p>
library appropriate to your target ABI. For more information on ensuring library support for
ABIs, see <a href="#sa">Selecting ABIs for Prebuilt Libraries.</a></p></li>
<li>Include {@code PREBUILT_SHARED_LIBRARY} or {@code PREBUILT_STATIC_LIBRARY}, depending on
whether you are using a shared ({@code .so}) or static {@code .a}) library.</li>
whether you are using a shared ({@code .so}) or static ({@code .a}) library.</li>
</ol>
<p>Here is a trivial example that assumes the prebuilt library {@code libfoo.so} resides in