diff --git a/packages/swig/Android.mk.in b/packages/swig/Android.mk.in
index 89b866863..a0fb7b1e6 100644
--- a/packages/swig/Android.mk.in
+++ b/packages/swig/Android.mk.in
@@ -6,7 +6,7 @@ include $(CLEAR_VARS)
 
 LOCAL_LDLIBS := -landroid -llog
 LOCAL_MODULE    := yap0
-LOCAL_SRC_FILES += @abs_top_builddir@/../../gmp/lib/libgmp.so
+LOCAL_SRC_FILES += @abs_top_builddir@/../../gmp-android/lib/libgmp.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -24,7 +24,7 @@ LOCAL_MODULE    := example
 LOCAL_SHARED_LIBRARIES := yap0  yap1
 LOCAL_STATIC_LIBRARIES := @abs_top_builddir@/libYap.ar
 LOCAL_SRC_FILES +=  @abs_top_builddir@/packages/swig/android/jni/yap_wrap.cpp
-LOCAL_C_INCLUDES :=  @abs_top_builddir@ @abs_top_builddir@/../../gmp/include @srcdir@/../../H @srcdir@/../../include  @srcdir@/../../os @srcdir@/../../OPTYap @srcdir@/../../BEAM @srcdir@/../../CXX
+LOCAL_C_INCLUDES :=  @abs_top_builddir@ @abs_top_builddir@/../../gmp-android/include @srcdir@/../../H @srcdir@/../../include  @srcdir@/../../os @srcdir@/../../OPTYap @srcdir@/../../BEAM @srcdir@/../../CXX
 LOCAL_CFLAGS := @YAP_EXTRAS@ @DEFS@ -D_YAP_NOT_INSTALLED_=1 -DDESTDIR=\"\"
 LOCAL_CPP_FEATURES := rtti
 # LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
diff --git a/packages/swig/android/SwigSimple.java b/packages/swig/android/SwigSimple.java
index 3d79ee268..adaf94b74 100644
--- a/packages/swig/android/SwigSimple.java
+++ b/packages/swig/android/SwigSimple.java
@@ -178,15 +178,15 @@ class JavaCallback extends YAPCallback
 
   public void run()
   {
-    System.out.println("JavaCallback.run() ");
-	Log.i(TAG, "java callback ");
- }
+      Log.i(TAG, "java callback ");
+      System.out.println("JavaCallback.run() ");
+  }
   
-  public void displayInWindow(String s)
+  public void run(String s)
   {
     System.out.println("JavaCallback.run() ");
-	Log.i(TAG, "java callback ");
-	output.append(s);
+    Log.i(TAG, "java callback ");
+    output.append(s);
  }
   
   private static final String TAG = "JavaCallback";