From 236b007c931ea0a7aa2134f3bdea8b7d98a3d69c Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 13 Sep 2012 19:04:29 +0000
Subject: [PATCH] More Android docs about the STL and the new extend example

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13836 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/Android.html  | 24 ++++++++++++++++++++++++
 Doc/Manual/Contents.html |  1 +
 2 files changed, 25 insertions(+)

diff --git a/Doc/Manual/Android.html b/Doc/Manual/Android.html
index eb87ea162..4d1be3944 100644
--- a/Doc/Manual/Android.html
+++ b/Doc/Manual/Android.html
@@ -17,6 +17,7 @@
 <li><a href="#Android_example_class">C++ class example</a>
 <li><a href="#Android_examples_other">Other examples</a>
 </ul>
+<li><a href="#Android_stl">C++ STL</a>
 </ul>
 </div>
 <!-- INDEX -->
@@ -752,6 +753,29 @@ Run the app to see the result of calling the C++ code from Java:
 The Examples/android directory contains further examples which can be run and installed in a similar manner to the previous two examples.
 </p>
 
+<p>
+Note that the 'extend' example is demonstrates the directors feature.
+Normally C++ exception handling and the STL is not available by default in the version of g++ shipped with Android, but this example turns these features on as described in the next section.
+</p>
+
+<H2><a name="Android_stl"></a>18.3 C++ STL</H2>
+
+
+<p>
+Should the C++ Standard Template Library (STL) be required, an <tt>Application.mk</tt> file needs to be created 
+in the same directory as the <tt>Android.mk</tt> directory containing information about the STL to use.
+See the NDK documentation in the $NDKROOT/docs folder especially CPLUSPLUS-SUPPORT.html.
+Below is an example of the <tt>Application.mk</tt> file to make the STLport static library available for use:
+</p>
+
+<div class="code">
+<pre>
+# File: Application.mk
+APP_STL := gnustl_static
+</pre>
+</div>
+
+
 </body>
 </html>
 
diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index eeb059598..74040ff0e 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -647,6 +647,7 @@
 <li><a href="Android.html#Android_example_class">C++ class example</a>
 <li><a href="Android.html#Android_examples_other">Other examples</a>
 </ul>
+<li><a href="Android.html#Android_stl">C++ STL</a>
 </ul>
 </div>
 <!-- INDEX -->