diff options
| author | David Friedman <dmail@google.com> | 2015-05-28 13:25:32 -0700 |
|---|---|---|
| committer | David Friedman <dmail@google.com> | 2015-05-28 13:25:32 -0700 |
| commit | 9f33a2574903844c7a6e033bf86f7ae035350ff2 (patch) | |
| tree | d56d808265d7d14d7040449e645cb07843a26ea7 | |
| parent | 8bf833e40f403f5f40233bf7c68778b2401c5673 (diff) | |
| download | frameworks_base-9f33a2574903844c7a6e033bf86f7ae035350ff2.zip frameworks_base-9f33a2574903844c7a6e033bf86f7ae035350ff2.tar.gz frameworks_base-9f33a2574903844c7a6e033bf86f7ae035350ff2.tar.bz2 | |
Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
Change-Id: I78d719f48f795f0477e4a08920ddb05fce48b5fc
| -rw-r--r-- | docs/html-ndk/ndk/guides/android_mk.jd | 7 | ||||
| -rw-r--r-- | docs/html-ndk/ndk/guides/prebuilts.jd | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/docs/html-ndk/ndk/guides/android_mk.jd b/docs/html-ndk/ndk/guides/android_mk.jd index 8d0a8b1..9c3c0ec 100644 --- a/docs/html-ndk/ndk/guides/android_mk.jd +++ b/docs/html-ndk/ndk/guides/android_mk.jd @@ -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,<name>) <p>In this example, the build system looks for the module tagged {@code <name>} 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>
\ No newline at end of file diff --git a/docs/html-ndk/ndk/guides/prebuilts.jd b/docs/html-ndk/ndk/guides/prebuilts.jd index f13e70e..52eb437 100644 --- a/docs/html-ndk/ndk/guides/prebuilts.jd +++ b/docs/html-ndk/ndk/guides/prebuilts.jd @@ -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 |