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

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

am ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete... 

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

* commit 'ed8c6295':
  Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
parents 01c4d8d3 ed8c6295

docs/html-ndk/ndk/guides/android_mk.jd

+2 −5
Original line number Diff line number Diff line
@@ -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.
@@ -873,6 +873,3 @@ $(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>
 
 No newline at end of file
 


<p>For more information, see <a href="import.html">Android Module Paths (Sharing Code)</a>.

</p>

docs/html-ndk/ndk/guides/prebuilts.jd

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