Add Android examples

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12866 626c5289-ae23-0410-ae9c-e8d60b6d4f22

30 files changed, 826 insertions, 0 deletions

diff --git a/Examples/android/check.list b/Examples/android/check.list
new file mode 100644
index 000000000..69d56a4f6
--- /dev/null
+++ b/Examples/android/check.list
@@ -0,0 +1,3 @@
+# see top-level Makefile.in
+class
+simple
diff --git a/Examples/android/class/AndroidManifest.xml b/Examples/android/class/AndroidManifest.xml
new file mode 100644
index 000000000..45c1fb1c7
--- /dev/null
+++ b/Examples/android/class/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.swig.classexample"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application android:label="@string/app_name" >
+        <activity android:name="SwigClass"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest> 
diff --git a/Examples/android/class/Makefile b/Examples/android/class/Makefile
new file mode 100644
index 000000000..7de95f559
--- /dev/null
+++ b/Examples/android/class/Makefile
@@ -0,0 +1,29 @@
+TOP        = ../..
+SWIG       = $(TOP)/../preinst-swig
+TARGET     = example
+INTERFACE  = example.i
+PACKAGEDIR = src/org/swig
+PACKAGENAME= org.swig.classexample
+SWIGOPT    = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/classexample 
+PROJECTNAME= SwigClass
+TARGETID  = 1
+
+all::	android
+
+android::
+	android update project --target $(TARGETID) --name $(PROJECTNAME) --path .
+	$(SWIG) -c++ -java $(SWIGOPT) -o jni/$(TARGET)_wrap.cpp jni/$(INTERFACE)
+	ndk-build
+	ant debug
+
+install::
+	-adb uninstall $(PACKAGENAME)
+	adb install bin/$(PROJECTNAME)-debug.apk
+
+clean::
+	ant clean
+	rm -f jni/$(TARGET)_wrap.cpp
+	rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java`
+	
+
+check: all
diff --git a/Examples/android/class/ant.properties b/Examples/android/class/ant.properties
new file mode 100644
index 000000000..ee52d86d9
--- /dev/null
+++ b/Examples/android/class/ant.properties
@@ -0,0 +1,17 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
diff --git a/Examples/android/class/build.xml b/Examples/android/class/build.xml
new file mode 100644
index 000000000..fe06943a9
--- /dev/null
+++ b/Examples/android/class/build.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="SwigClass" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <loadproperties srcFile="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+            unless="sdk.dir"
+    />
+
+
+<!-- extension targets. Uncomment the ones where you want to do custom work
+     in between standard targets -->
+<!--
+    <target name="-pre-build">
+    </target>
+    <target name="-pre-compile">
+    </target>
+
+    /* This is typically used for code obfuscation.
+       Compiled code location: ${out.classes.absolute.dir}
+       If this is not done in place, override ${out.dex.input.absolute.dir} */
+    <target name="-post-compile">
+    </target>
+-->
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/Examples/android/class/jni/Android.mk b/Examples/android/class/jni/Android.mk
new file mode 100644
index 000000000..25d42b541
--- /dev/null
+++ b/Examples/android/class/jni/Android.mk
@@ -0,0 +1,10 @@
+# File: Android.mk
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := example
+LOCAL_SRC_FILES := example_wrap.cpp example.cpp
+LOCAL_CFLAGS    := -frtti
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/Examples/android/class/jni/example.cpp b/Examples/android/class/jni/example.cpp
new file mode 100644
index 000000000..d59cc7c32
--- /dev/null
+++ b/Examples/android/class/jni/example.cpp
@@ -0,0 +1,28 @@
+/* File : example.cpp */
+
+#include "example.h"
+#define M_PI 3.14159265358979323846
+
+/* Move the shape to a new location */
+void Shape::move(double dx, double dy) {
+  x += dx;
+  y += dy;
+}
+
+int Shape::nshapes = 0;
+
+double Circle::area(void) {
+  return M_PI*radius*radius;
+}
+
+double Circle::perimeter(void) {
+  return 2*M_PI*radius;
+}
+
+double Square::area(void) {
+  return width*width;
+}
+
+double Square::perimeter(void) {
+  return 4*width;
+}
diff --git a/Examples/android/class/jni/example.h b/Examples/android/class/jni/example.h
new file mode 100644
index 000000000..64b7684fa
--- /dev/null
+++ b/Examples/android/class/jni/example.h
@@ -0,0 +1,34 @@
+/* File : example.h */
+
+class Shape {
+public:
+  Shape() {
+    nshapes++;
+  }
+  virtual ~Shape() {
+    nshapes--;
+  };
+  double  x, y;   
+  void    move(double dx, double dy);
+  virtual double area(void) = 0;
+  virtual double perimeter(void) = 0;
+  static  int nshapes;
+};
+
+class Circle : public Shape {
+private:
+  double radius;
+public:
+  Circle(double r) : radius(r) { };
+  virtual double area(void);
+  virtual double perimeter(void);
+};
+
+class Square : public Shape {
+private:
+  double width;
+public:
+  Square(double w) : width(w) { };
+  virtual double area(void);
+  virtual double perimeter(void);
+};
diff --git a/Examples/android/class/jni/example.i b/Examples/android/class/jni/example.i
new file mode 100644
index 000000000..fbdf7249f
--- /dev/null
+++ b/Examples/android/class/jni/example.i
@@ -0,0 +1,9 @@
+/* File : example.i */
+%module example
+
+%{
+#include "example.h"
+%}
+
+/* Let's just grab the original header file here */
+%include "example.h"
diff --git a/Examples/android/class/local.properties b/Examples/android/class/local.properties
new file mode 100644
index 000000000..14b8d63b4
--- /dev/null
+++ b/Examples/android/class/local.properties
@@ -0,0 +1,10 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked in Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=/home/william/android/android-sdk-linux_x86
diff --git a/Examples/android/class/proguard.cfg b/Examples/android/class/proguard.cfg
new file mode 100644
index 000000000..b1cdf17b5
--- /dev/null
+++ b/Examples/android/class/proguard.cfg
@@ -0,0 +1,40 @@
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-verbose
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class com.android.vending.licensing.ILicensingService
+
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
diff --git a/Examples/android/class/project.properties b/Examples/android/class/project.properties
new file mode 100644
index 000000000..ea89160e0
--- /dev/null
+++ b/Examples/android/class/project.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-8
diff --git a/Examples/android/class/res/layout/main.xml b/Examples/android/class/res/layout/main.xml
new file mode 100644
index 000000000..d4e5d7fe8
--- /dev/null
+++ b/Examples/android/class/res/layout/main.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<Button
+    android:id="@+id/RunButton"  
+    android:layout_width="wrap_content"  
+    android:layout_height="wrap_content"  
+    android:text="Run..."  
+    android:onClick="onRunButtonClick"
+    />
+<ScrollView
+    android:id="@+id/Scroller"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView
+    android:id="@+id/OutputText"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    />
+</ScrollView>
+</LinearLayout>
diff --git a/Examples/android/class/res/values/strings.xml b/Examples/android/class/res/values/strings.xml
new file mode 100644
index 000000000..72910f9d7
--- /dev/null
+++ b/Examples/android/class/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">SwigClass</string>
+</resources>
diff --git a/Examples/android/class/src/org/swig/classexample/SwigClass.java b/Examples/android/class/src/org/swig/classexample/SwigClass.java
new file mode 100644
index 000000000..2860cdd9d
--- /dev/null
+++ b/Examples/android/class/src/org/swig/classexample/SwigClass.java
@@ -0,0 +1,106 @@
+package org.swig.classexample;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.ScrollView;
+import android.text.method.ScrollingMovementMethod;
+
+public class SwigClass extends Activity
+{
+    TextView outputText = null;
+    ScrollView scroller = null;
+
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+
+        outputText = (TextView)findViewById(R.id.OutputText);
+        outputText.setText("Press 'Run' to start...\n");
+        outputText.setMovementMethod(new ScrollingMovementMethod());
+
+        scroller = (ScrollView)findViewById(R.id.Scroller);
+    }
+
+    public void onRunButtonClick(View view)
+    {
+      outputText.append("Started...\n");
+      nativeCall();
+      outputText.append("Finished!\n");
+      
+      // Ensure scroll to end of text
+      scroller.post(new Runnable() {
+        public void run() {
+          scroller.fullScroll(ScrollView.FOCUS_DOWN);
+        }
+      });
+    }
+
+    /** Calls into C/C++ code */
+    public void nativeCall()
+    {
+      // ----- Object creation -----
+
+      outputText.append( "Creating some objects:\n" );
+      Circle c = new Circle(10);
+      outputText.append( "    Created circle " + c + "\n");
+      Square s = new Square(10);
+      outputText.append( "    Created square " + s + "\n");
+
+      // ----- Access a static member -----
+
+      outputText.append( "\nA total of " + Shape.getNshapes() + " shapes were created\n" );
+
+      // ----- Member data access -----
+
+      // Notice how we can do this using functions specific to
+      // the 'Circle' class.
+      c.setX(20);
+      c.setY(30);
+
+      // Now use the same functions in the base class
+      Shape shape = s;
+      shape.setX(-10);
+      shape.setY(5);
+
+      outputText.append( "\nHere is their current position:\n" );
+      outputText.append( "    Circle = (" + c.getX() + " " + c.getY() + ")\n" );
+      outputText.append( "    Square = (" + s.getX() + " " + s.getY() + ")\n" );
+
+      // ----- Call some methods -----
+
+      outputText.append( "\nHere are some properties of the shapes:\n" );
+      Shape[] shapes = {c,s};
+      for (int i=0; i<shapes.length; i++)
+      {
+        outputText.append( "   " + shapes[i].toString() + "\n" );
+        outputText.append( "        area      = " + shapes[i].area() + "\n" );
+        outputText.append( "        perimeter = " + shapes[i].perimeter() + "\n" );
+      }
+
+      // Notice how the area() and perimeter() functions really
+      // invoke the appropriate virtual method on each object.
+
+      // ----- Delete everything -----
+
+      outputText.append( "\nGuess I'll clean up now\n" );
+
+      // Note: this invokes the virtual destructor
+      // You could leave this to the garbage collector
+      c.delete();
+      s.delete();
+
+      outputText.append( Shape.getNshapes() + " shapes remain\n" );
+      outputText.append( "Goodbye\n" );
+    }
+
+    /** static constructor */
+    static {
+        System.loadLibrary("example");
+    }
+}
diff --git a/Examples/android/simple/AndroidManifest.xml b/Examples/android/simple/AndroidManifest.xml
new file mode 100644
index 000000000..76ee185ca
--- /dev/null
+++ b/Examples/android/simple/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.swig.simple"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application android:label="@string/app_name" >
+        <activity android:name="SwigSimple"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest> 
diff --git a/Examples/android/simple/Makefile b/Examples/android/simple/Makefile
new file mode 100644
index 000000000..1e95de6e3
--- /dev/null
+++ b/Examples/android/simple/Makefile
@@ -0,0 +1,29 @@
+TOP        = ../..
+SWIG       = $(TOP)/../preinst-swig
+TARGET     = example
+INTERFACE  = example.i
+PACKAGEDIR = src/org/swig
+PACKAGENAME= org.swig.simple
+SWIGOPT    = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/simple
+PROJECTNAME= SwigSimple
+TARGETID  = 1
+
+all::	android
+
+android::
+	android update project --target $(TARGETID) --name $(PROJECTNAME) --path .
+	$(SWIG) -java $(SWIGOPT) -o jni/$(TARGET)_wrap.c jni/$(INTERFACE)
+	ndk-build
+	ant debug
+
+install::
+	-adb uninstall $(PACKAGENAME)
+	adb install bin/$(PROJECTNAME)-debug.apk
+
+clean::
+	ant clean
+	rm -f jni/$(TARGET)_wrap.c
+	rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java`
+	
+
+check: all
diff --git a/Examples/android/simple/ant.properties b/Examples/android/simple/ant.properties
new file mode 100644
index 000000000..ee52d86d9
--- /dev/null
+++ b/Examples/android/simple/ant.properties
@@ -0,0 +1,17 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
diff --git a/Examples/android/simple/build.xml b/Examples/android/simple/build.xml
new file mode 100644
index 000000000..09a0bff37
--- /dev/null
+++ b/Examples/android/simple/build.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="SwigSimple" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <loadproperties srcFile="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+            unless="sdk.dir"
+    />
+
+
+<!-- extension targets. Uncomment the ones where you want to do custom work
+     in between standard targets -->
+<!--
+    <target name="-pre-build">
+    </target>
+    <target name="-pre-compile">
+    </target>
+
+    /* This is typically used for code obfuscation.
+       Compiled code location: ${out.classes.absolute.dir}
+       If this is not done in place, override ${out.dex.input.absolute.dir} */
+    <target name="-post-compile">
+    </target>
+-->
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/Examples/android/simple/jni/Android.mk b/Examples/android/simple/jni/Android.mk
new file mode 100644
index 000000000..b2f2dadb5
--- /dev/null
+++ b/Examples/android/simple/jni/Android.mk
@@ -0,0 +1,9 @@
+# File: Android.mk
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := example
+LOCAL_SRC_FILES := example_wrap.c example.c
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/Examples/android/simple/jni/example.c b/Examples/android/simple/jni/example.c
new file mode 100644
index 000000000..9325fd70c
--- /dev/null
+++ b/Examples/android/simple/jni/example.c
@@ -0,0 +1,17 @@
+/* File : example.c */
+
+/* A global variable */
+double Foo = 3.0;
+
+/* Compute the greatest common divisor of positive integers */
+int gcd(int x, int y) {
+  int g;
+  g = y;
+  while (x > 0) {
+    g = x;
+    x = y % x;
+    y = g;
+  }
+  return g;
+}
+
diff --git a/Examples/android/simple/jni/example.i b/Examples/android/simple/jni/example.i
new file mode 100644
index 000000000..24093b9bf
--- /dev/null
+++ b/Examples/android/simple/jni/example.i
@@ -0,0 +1,7 @@
+/* File : example.i */
+%module example
+
+%inline %{
+extern int    gcd(int x, int y);
+extern double Foo;
+%}
diff --git a/Examples/android/simple/local.properties b/Examples/android/simple/local.properties
new file mode 100644
index 000000000..14b8d63b4
--- /dev/null
+++ b/Examples/android/simple/local.properties
@@ -0,0 +1,10 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked in Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=/home/william/android/android-sdk-linux_x86
diff --git a/Examples/android/simple/proguard.cfg b/Examples/android/simple/proguard.cfg
new file mode 100644
index 000000000..b1cdf17b5
--- /dev/null
+++ b/Examples/android/simple/proguard.cfg
@@ -0,0 +1,40 @@
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-verbose
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class com.android.vending.licensing.ILicensingService
+
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
diff --git a/Examples/android/simple/project.properties b/Examples/android/simple/project.properties
new file mode 100644
index 000000000..ea89160e0
--- /dev/null
+++ b/Examples/android/simple/project.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-8
diff --git a/Examples/android/simple/res/layout/main.xml b/Examples/android/simple/res/layout/main.xml
new file mode 100644
index 000000000..d4e5d7fe8
--- /dev/null
+++ b/Examples/android/simple/res/layout/main.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<Button
+    android:id="@+id/RunButton"  
+    android:layout_width="wrap_content"  
+    android:layout_height="wrap_content"  
+    android:text="Run..."  
+    android:onClick="onRunButtonClick"
+    />
+<ScrollView
+    android:id="@+id/Scroller"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView
+    android:id="@+id/OutputText"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    />
+</ScrollView>
+</LinearLayout>
diff --git a/Examples/android/simple/res/values/strings.xml b/Examples/android/simple/res/values/strings.xml
new file mode 100644
index 000000000..881c19c8d
--- /dev/null
+++ b/Examples/android/simple/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">SwigSimple</string>
+</resources>
diff --git a/Examples/android/simple/src/org/swig/simple/SwigSimple.java b/Examples/android/simple/src/org/swig/simple/SwigSimple.java
new file mode 100644
index 000000000..575fdc5ce
--- /dev/null
+++ b/Examples/android/simple/src/org/swig/simple/SwigSimple.java
@@ -0,0 +1,75 @@
+package org.swig.simple;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.ScrollView;
+import android.text.method.ScrollingMovementMethod;
+
+public class SwigSimple extends Activity
+{
+    TextView outputText = null;
+    ScrollView scroller = null;
+
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+
+        outputText = (TextView)findViewById(R.id.OutputText);
+        outputText.setText("Press 'Run' to start...\n");
+        outputText.setMovementMethod(new ScrollingMovementMethod());
+
+        scroller = (ScrollView)findViewById(R.id.Scroller);
+    }
+
+    public void onRunButtonClick(View view)
+    {
+      outputText.append("Started...\n");
+      nativeCall();
+      outputText.append("Finished!\n");
+      
+      // Ensure scroll to end of text
+      scroller.post(new Runnable() {
+        public void run() {
+          scroller.fullScroll(ScrollView.FOCUS_DOWN);
+        }
+      });
+    }
+
+    /** Calls into C/C++ code */
+    public void nativeCall()
+    {
+      // Call our gcd() function
+      
+      int x = 42;
+      int y = 105;
+      int g = example.gcd(x,y);
+      outputText.append("The greatest common divisor of " + x + " and " + y + " is " + g + "\n");
+
+      // Manipulate the Foo global variable
+
+      // Output its current value
+      double foo = example.getFoo();
+      outputText.append("Foo = " + foo + "\n");
+
+      // Change its value
+      example.setFoo(3.1415926);
+
+      // See if the change took effect
+      outputText.append("Foo = " + example.getFoo() + "\n");
+
+      // Restore value
+      example.setFoo(foo);
+    }
+
+    /** static constructor */
+    static {
+        System.loadLibrary("example");
+    }
+}
+
diff --git a/Makefile.in b/Makefile.in
index fc09d1f9c..c9cda109b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,6 +80,7 @@ skip-d		= test -n "@SKIP_D@"
 
 # Additional dependencies for some tests
 skip-gcj        = test -n "@SKIP_GCJ@"
+skip-android    = test -n "@SKIP_ANDROID@"
 
 #####################################################################
 # CHECK
@@ -128,6 +129,7 @@ check-examples:					\
 	check-perl5-examples			\
 	check-python-examples			\
 	check-java-examples			\
+	check-android-examples			\
 	check-guile-examples			\
 	check-mzscheme-examples			\
 	check-ruby-examples			\
@@ -151,6 +153,7 @@ tcl_examples       :=$(shell sed '/^\#/d' $(srcdir)/Examples/tcl/check.list)
 perl5_examples     :=$(shell sed '/^\#/d' $(srcdir)/Examples/perl5/check.list)
 python_examples    :=$(shell sed '/^\#/d' $(srcdir)/Examples/python/check.list)
 java_examples      :=$(shell sed '/^\#/d' $(srcdir)/Examples/java/check.list)
+android_examples   :=$(shell sed '/^\#/d' $(srcdir)/Examples/android/check.list)
 guile_examples     :=$(shell sed '/^\#/d' $(srcdir)/Examples/guile/check.list)
 mzscheme_examples  :=$(shell sed '/^\#/d' $(srcdir)/Examples/mzscheme/check.list)
 ruby_examples      :=$(shell sed '/^\#/d' $(srcdir)/Examples/ruby/check.list)
diff --git a/configure.in b/configure.in
index a4fa62b52..7e3b43d9b 100644
--- a/configure.in
+++ b/configure.in
@@ -1106,6 +1106,51 @@ AC_SUBST(GCJ)
 AC_SUBST(GCJH)
 
 #----------------------------------------------------------------
+# Look for Android
+#----------------------------------------------------------------
+
+AC_ARG_WITH(android, AS_HELP_STRING([--without-android], [Disable Android])
+AS_HELP_STRING([--with-android=path], [Set location of android executable]),[ANDROIDBIN="$withval"], [ANDROIDBIN=yes])
+AC_ARG_WITH(adb, [  --with-adb=path       Set location of adb executable - Android Debug Bridge],[ADBBIN="$withval"], [ADBBIN=])
+AC_ARG_WITH(ant, [  --with-ant=path       Set location of ant executable for Android],[ANTBIN="$withval"], [ANTBIN=])
+AC_ARG_WITH(ndk-build, [  --with-ndk-build=path       Set location of Android ndk-build executable],[NDKBUILDBIN="$withval"], [NDKBUILDBIN=])
+
+# First, check for "--without-android" or "--with-android=no".
+if test x"${ANDROIDBIN}" = xno -o x"${with_alllang}" = xno ; then 
+  AC_MSG_NOTICE([Disabling Android])
+  ANDROID=
+else
+  if test "x$ANDROIDBIN" = xyes; then
+    AC_CHECK_PROGS(ANDROID, android)
+  else
+    ANDROID="$ANDROIDBIN"
+  fi
+
+  if test -z "$ADBBIN"; then
+    AC_CHECK_PROGS(ADB, adb)
+  else
+    ADB="$ADBBIN"
+  fi
+
+  if test -z "$ANTBIN"; then
+    AC_CHECK_PROGS(ANT, ant)
+  else
+    ANT="$ANTBIN"
+  fi
+
+  if test -z "$NDKBUILDBIN"; then
+    AC_CHECK_PROGS(NDKBUILD, ndk-build)
+  else
+    NDKBUILD="$NDKBUILDBIN"
+  fi
+fi
+
+AC_SUBST(ANDROID)
+AC_SUBST(ADB)
+AC_SUBST(ANT)
+AC_SUBST(NDKBUILD)
+
+#----------------------------------------------------------------
 # Look for Guile
 #----------------------------------------------------------------
 
@@ -2303,6 +2348,14 @@ fi
 AC_SUBST(SKIP_GCJ)
 
 
+SKIP_ANDROID=
+if test -z "$ANDROID" || test -z "$ADB" || test -z "$ANT" || test -z "$NDKBUILD" ; then
+    SKIP_ANDROID="1"
+fi
+AC_SUBST(SKIP_ANDROID)
+
+
+
 #----------------------------------------------------------------
 # Miscellaneous
 #----------------------------------------------------------------