diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2014-09-05 00:55:43 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-05 00:55:43 +0000 |
commit | d2ab98b51954ddb5796d810fd0b9f493d32b92f0 (patch) | |
tree | eabcfa089211442ca8832075bf996111919f22a5 /docs | |
parent | ae652be6663b369b74a39d5dce246f3c87696085 (diff) | |
parent | fed750df8997ce28e72a3455743585bdaba7d155 (diff) | |
download | ndk-d2ab98b51954ddb5796d810fd0b9f493d32b92f0.tar.gz |
Merge "Fixed some typos (artifacts of 80-col fold) and a broken link."
Diffstat (limited to 'docs')
5 files changed, 16 insertions, 27 deletions
diff --git a/docs/Programmers_Guide/html/index.html b/docs/Programmers_Guide/html/index.html index f370cec16..829502301 100644 --- a/docs/Programmers_Guide/html/index.html +++ b/docs/Programmers_Guide/html/index.html @@ -55,13 +55,13 @@ $(document).ready(function(){initNavTree('index.html','');}); <div class="contents"> <div class="textblock"><ul style="list-style: none; "> <li> -<a href="/md_1__concepts__concepts.html">1. Concepts</a> <ul style="list-style: none; "> +<a href="./md_1__concepts__concepts.html">1. Concepts</a> <ul style="list-style: none; "> <li> <a href="./md_1__concepts__concepts.html#bb">Before Beginning</a> </li> <li> <a href="./md_1__concepts__concepts.html#intro">Introduction</a> </li> <li> -<a href="./md_1__concepts__concepts.html#hiw">How It Works</a> <ul style="list-style: none; "> +<a href="./md_1__concepts__concepts.html#hiw">Process</a> <ul style="list-style: none; "> <li> <a href="./md_1__concepts__concepts.html#mc">Main Components</a> </li> <li> diff --git a/docs/Programmers_Guide/html/md_1__concepts__concepts.html b/docs/Programmers_Guide/html/md_1__concepts__concepts.html index b3f6c4563..8f107aee4 100644 --- a/docs/Programmers_Guide/html/md_1__concepts__concepts.html +++ b/docs/Programmers_Guide/html/md_1__concepts__concepts.html @@ -60,7 +60,7 @@ $(document).ready(function(){initNavTree('md_1__concepts__concepts.html','');}); <li> <a href="#intro">Introduction</a> </li> <li> -<a href="#hiw">How It Works</a> <ul style="list-style:none;"> +<a href="#hiw">Process</a> <ul style="list-style:none;"> <li> <a href="#mc">Main Components</a> </li> <ul> @@ -127,9 +127,8 @@ between platform releases. If the NDK headers do not explicitly support an Android system library, then apps should not depend on its being available; otherwise, the next over-the-air (“OTA”) system update may break them. -<p><br/> -</p> -<p><a class="anchor" id="hiw">Main Components and Flow</a> </p> + +<p><a class="anchor" id="hiw"></a> </p> <h2>Process</h2> <p>This section introduces the main components used in building a native application for Android, and goes on to describe the flow of building and @@ -151,8 +150,7 @@ determine what to build.</li> </li> </ul> <p>For more information, see the <a -href="./md_3__key__topics__building__chapter_1-section_8_ndk-build.html">ndk-bui -ld</a> section of this guide.</p> +href="./md_3__key__topics__building__chapter_1-section_8_ndk-build.html">ndk-build</a> section of this guide.</p> <p><a class="anchor" id="jav"></a></p> <ul> <li>Java: From your Java source, the Android build process generates @@ -195,15 +193,13 @@ app's machine code is expected to interact with the system at runtime. The NDK builds <code>.so</code> files against these definitions. Different ABIs correspond to different architectures: The NDK includes ABI support for ARMEABI (default), MIPS, and x86. For more information, see <a -href="./md_3__key__topics__c_p_u__support__chapter_1-section_8__a_b_is.html">Sup -ported ABIs</a>.</li> +href="./md_3__key__topics__c_p_u__support__chapter_1-section_8__a_b_is.html">Supported ABIs</a>.</li> </ul> <p><a class="anchor" id="man"></a></p> <ul> <li>Manifest: If you are writing an app with no Java component to it, you must declare the NativeActivity class in the <a -href="http://developer.android.com/guide/topics/manifest/manifest-intro.html">ma -nifest</a>. The <a href=#naa>Native Activity</a> section provides more detail +href="http://developer.android.com/guide/topics/manifest/manifest-intro.html">manifest</a>. The <a href=#naa>Native Activity</a> section provides more detail on how to do this, under “Using the native-activity.h interface.”</li> </ul> <br> @@ -217,8 +213,7 @@ configuration file inside your <code>jni</code> 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. For more information, see the <a -href="./md_3__key__topics__building__chapter_1-section_8__android_8mk.html">Andr -oid.mk</a> section of this document.</li> +href="./md_3__key__topics__building__chapter_1-section_8__android_8mk.html">Android.mk</a> section of this document.</li> </ul> <p><a class="anchor" id="app"></a></p> <ul> @@ -386,8 +381,7 @@ href="http://developer.android.com/training/basics/activity-lifecycle/index.html <li>Create an <code>Android.mk file</code> in the <code>jni/</code> directory of your project to describe your native module to the build system. For more information, see the <a -href="./md_3__key__topics__building__chapter_1-section_8__android_8mk.html">Andr -oid.mk section.</a>.</li> +href="./md_3__key__topics__building__chapter_1-section_8__android_8mk.html">Android.mk section.</a></li> <li>Once you have an <code>Android.mk</code> file, compile your native code using the <code>ndk-build</code> command.</li> diff --git a/docs/Programmers_Guide/html/md_2__samples_sample--hellojni.html b/docs/Programmers_Guide/html/md_2__samples_sample--hellojni.html index c518ded4c..6eda02c37 100644 --- a/docs/Programmers_Guide/html/md_2__samples_sample--hellojni.html +++ b/docs/Programmers_Guide/html/md_2__samples_sample--hellojni.html @@ -65,16 +65,14 @@ library is <code>libhello-jni.so</code>, but you should omit the LOCAL_MODULE := hello-jni </pre><p>For more information on what this file does, and how to use it, see the <a -href="./md_3__key__topics__building__chapter_1-section_8__android_8mk.html">Andr -oid.mk</a> section.</p> +href="./md_3__key__topics__building__chapter_1-section_8__android_8mk.html">Android.mk</a> section.</p> <h3>Application.mk</h3> <p>This line tells the build system the architecture against which to build. If you don't specify anything, the build system defaults to armeabi.</p> <pre class="fragment">APP_ABI := all </pre><p>For more information on what this file does, and how to use it, see the <a -href="./md_3__key__topics__building__a_p_p_l_i_c_a_t_i_o_n-_m_k.html">Applicatio -n.mk</a> section.</p> +href="./md_3__key__topics__building__a_p_p_l_i_c_a_t_i_o_n-_m_k.html">Application.mk</a> section.</p> <h3>Java-side implementation</h3> <p>This file calls a function to retrieve a string from the native side, then displays it on the screen.</p> diff --git a/docs/Programmers_Guide/html/md_2__samples_sample--nativeactivity.html b/docs/Programmers_Guide/html/md_2__samples_sample--nativeactivity.html index 609a5ac9e..0d7289e5b 100644 --- a/docs/Programmers_Guide/html/md_2__samples_sample--nativeactivity.html +++ b/docs/Programmers_Guide/html/md_2__samples_sample--nativeactivity.html @@ -86,8 +86,7 @@ extension. This value must be the same as the one you described for each preceded by the <code>-l</code> (link-against) option.</p> <ul> <li>log is a logging library.</li> -<li>android encompasses the standard Android support APIs for NDK. The -[“Stable APIs”])(./md_3__key__topics__libraries__s_t_a_b_l_e-_a_p_i_s.html) +<li>android encompasses the standard Android support APIs for NDK. The <a href="./md_3__key__topics__libraries__s_t_a_b_l_e-_a_p_i_s.html">Stable APIs</a> section discusses these in more detail.</li> <li>EGL, standardized by Khronos, corresponds to the platform-specific portion of the graphics API.</li> @@ -99,8 +98,7 @@ of the graphics API.</li> <code>.so</code> extension. For example, the actual file name for the <code>log</code> library is <code>liblog.so</code>.</li> <li>The library lives in the following directory, relative to the NDK root: -<code><ndk>/platforms/android-<sdk_version>/arch-<abi>/usr/lib -/</code>.</li> +<code><ndk>/platforms/android-<sdk_version>/arch-<abi>/usr/lib/</code>.</li> </ul> <pre class="fragment">LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM </pre><p>A static library, <code>android_native_app_glue</code>, that the @@ -114,8 +112,7 @@ generated during the build process. The next sample discusses the android_native_app_glue in more detail.</p> <pre class="fragment">$(call import-module,android/native_app_glue) </pre><p>For more information about the Application.mk file, consult the <a -href="./md_3__key__topics__building__a_p_p_l_i_c_a_t_i_o_n-_m_k.html">Applicatio -n.mk section</a> of this guide.</p> +href="./md_3__key__topics__building__a_p_p_l_i_c_a_t_i_o_n-_m_k.html">Application.mk section</a> of this guide.</p> <h3><code>Application.mk</code></h3> <p>This line defines the minimum level of Android API Level support.</p> <pre class="fragment">APP_PLATFORM := android-10 diff --git a/docs/Programmers_Guide/html/navtree.js b/docs/Programmers_Guide/html/navtree.js index 83af4d67c..dd99a84d0 100644 --- a/docs/Programmers_Guide/html/navtree.js +++ b/docs/Programmers_Guide/html/navtree.js @@ -4,7 +4,7 @@ var NAVTREE = [ "Concepts", "md_1__concepts__concepts.html", null ], [ "- Before Beginning", "md_1__concepts__concepts.html#bb", null ], [ "- Introduction", "md_1__concepts__concepts.html#intro", null ], - [ "- How it Works", "md_1__concepts__concepts.html#hiw", null ], + [ "- Process", "md_1__concepts__concepts.html#hiw", null ], [ "- Native Activities and Applications", "md_1__concepts__concepts.html#naa", null ], [ "Samples", "md_2__samples__samples.html", null ], [ "- hello-jni", "md_2__samples_sample--hellojni.html", null ], |