Index: /issm/trunk-jpl/src/android/ISSM/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/android/ISSM/Makefile.am	(revision 13931)
+++ /issm/trunk-jpl/src/android/ISSM/Makefile.am	(revision 13931)
@@ -0,0 +1,15 @@
+EXTRA_DIST =  AndroidManifest.xml  assets gen jni obj project.properties src Makefile.am bin ic_launcher-web.png libs proguard-project.txt res
+
+#Generate JNI library using the ndk-build capabilities:
+if SHAREDLIBS 	 	 
+deps = 	 	 
+else 	 	 
+deps = ../../c/libISSMCore.a 	 	 
+endif
+
+install-exec-am: all
+all: libs/armeabi/libIssmJni.so
+
+libs/armeabi/libIssmJni.so:  $(deps)
+	$(ANDROID_NDK_DIR)/ndk-build -C ./jni clean
+	$(ANDROID_NDK_DIR)/ndk-build -C ./jni
Index: /issm/trunk-jpl/src/android/ISSM/jni/Android.mk
===================================================================
--- /issm/trunk-jpl/src/android/ISSM/jni/Android.mk	(revision 13930)
+++ /issm/trunk-jpl/src/android/ISSM/jni/Android.mk	(revision 13931)
@@ -13,5 +13,5 @@
 LOCAL_CFLAGS := -Wno-psabi
 LOCAL_LDLIBS := -llog -ldl
-LOCAL_MODULE := FacLib
+LOCAL_MODULE := IssmJni
 LOCAL_SRC_FILES := Main.cpp 
 LOCAL_STATIC_LIBRARIES := libISSMCore
Index: /issm/trunk-jpl/src/android/ISSM/jni/Main.cpp
===================================================================
--- /issm/trunk-jpl/src/android/ISSM/jni/Main.cpp	(revision 13930)
+++ /issm/trunk-jpl/src/android/ISSM/jni/Main.cpp	(revision 13931)
@@ -1,7 +1,7 @@
-#include "./issmlib/include/fac.h"
-#include "com_example_issm_FacLib.h"
+#include "../../../c/android/fac.h"
+#include "com_example_issm_IssmJni.h"
 #include <cstddef>
 
-JNIEXPORT jlong JNICALL Java_com_example_issm_FacLib_fac(JNIEnv *env, jclass clazz, jlong n)
+JNIEXPORT jlong JNICALL Java_com_example_issm_IssmJni_fac(JNIEnv *env, jclass clazz, jlong n)
 {
 	fac *f = new fac();
Index: sm/trunk-jpl/src/android/ISSM/jni/com_example_issm_FacLib.h
===================================================================
--- /issm/trunk-jpl/src/android/ISSM/jni/com_example_issm_FacLib.h	(revision 13930)
+++ 	(revision )
@@ -1,21 +1,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_example_issm_FacLib */
-
-#ifndef _Included_com_example_issm_FacLib
-#define _Included_com_example_issm_FacLib
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     com_example_issm_FacLib
- * Method:    fac
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_com_example_issm_FacLib_fac
-  (JNIEnv *, jclass, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
Index: /issm/trunk-jpl/src/android/ISSM/jni/com_example_issm_IssmJni.h
===================================================================
--- /issm/trunk-jpl/src/android/ISSM/jni/com_example_issm_IssmJni.h	(revision 13931)
+++ /issm/trunk-jpl/src/android/ISSM/jni/com_example_issm_IssmJni.h	(revision 13931)
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_example_issm_IssmJni */
+
+#ifndef _Included_com_example_issm_IssmJni
+#define _Included_com_example_issm_IssmJni
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_example_issm_IssmJni
+ * Method:    fac
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_com_example_issm_IssmJni_fac
+  (JNIEnv *, jclass, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
Index: /issm/trunk-jpl/src/android/ISSM/jni/issmlib/Android.mk
===================================================================
--- /issm/trunk-jpl/src/android/ISSM/jni/issmlib/Android.mk	(revision 13930)
+++ /issm/trunk-jpl/src/android/ISSM/jni/issmlib/Android.mk	(revision 13931)
@@ -2,5 +2,5 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libISSMCore
-LOCAL_SRC_FILES := ../../../../../lib/libISSMCore.a
+LOCAL_SRC_FILES := ../../../../c/libISSMCore.a
 LOCAL_EXPORT_C_INCLUDES := ../../../../c/android/
 include $(PREBUILT_STATIC_LIBRARY)
Index: /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ISSM.java
===================================================================
--- /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ISSM.java	(revision 13930)
+++ /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ISSM.java	(revision 13931)
@@ -34,5 +34,5 @@
 			return;
 		}
-		long result = FacLib.facIterative(Long.parseLong(input));
+		long result = IssmJni.facIterative(Long.parseLong(input));
 		this.output.setText("Result = " + result + "\n");
 	}
Index: /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/IssmJni.java
===================================================================
--- /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/IssmJni.java	(revision 13931)
+++ /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/IssmJni.java	(revision 13931)
@@ -0,0 +1,13 @@
+package com.example.issm;
+
+public class IssmJni
+{
+	public static native long fac(long n);
+	static {
+        System.loadLibrary("IssmJni");
+    }
+	public static long facIterative(long n)
+	{
+		return fac(n);
+	}
+}