diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk
index ce1c8868bb..84bb5fb173 100644
--- a/OsmAnd/jni/Android.mk
+++ b/OsmAnd/jni/Android.mk
@@ -1,23 +1,38 @@
 LOCAL_PATH := $(call my-dir)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := skia2.2
-NDK_MODULE_PATH := $(LOCAL_PATH)
-LOCAL_SRC_FILES := libskia2.2.so
-
-include $(PREBUILT_SHARED_LIBRARY)
+#include $(CLEAR_VARS)
+#LOCAL_MODULE := skia2.2
+#NDK_MODULE_PATH := $(LOCAL_PATH)
+#LOCAL_SRC_FILES := libskia2.2.so
+#LOCAL_PRELINK_MODULE := false
+#
+#include $(PREBUILT_SHARED_LIBRARY)
 
 #include $(CLEAR_VARS)
-#LOCAL_MODULE := oskia
+#LOCAL_MODULE := skia_built
 #NDK_MODULE_PATH := $(LOCAL_PATH)
-#LOCAL_SRC_FILES := liboskia.a
+#LOCAL_SRC_FILES := skia_built.a
+#include $(PREBUILT_STATIC_LIBRARY)
+#
+#include $(CLEAR_VARS)
+#LOCAL_MODULE := png
+#NDK_MODULE_PATH := $(LOCAL_PATH)
+#LOCAL_SRC_FILES := libpng.a
+#include $(PREBUILT_STATIC_LIBRARY)
+#
+#include $(CLEAR_VARS)
+#LOCAL_MODULE := gif
+#NDK_MODULE_PATH := $(LOCAL_PATH)
+#LOCAL_SRC_FILES := libgif.a
+#include $(PREBUILT_STATIC_LIBRARY)
+#
+#include $(CLEAR_VARS)
+#LOCAL_MODULE := ft2
+#NDK_MODULE_PATH := $(LOCAL_PATH)
+#LOCAL_SRC_FILES := libft2.a
 #include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-
-#SKIA_FOLDER := $(LOCAL_PATH)/../../../skia/trunk
-#SKIA_SRC := $(LOCAL_PATH)/../../../skia/trunk/src
-#SKIA_FOLDER := $(LOCAL_PATH)/skia
 ANDROID_FOLDER := /home/victor/projects/android/
 SKIA_FOLDER := $(ANDROID_FOLDER)/external/skia
 SKIA_SRC := skia
@@ -38,16 +53,13 @@ LOCAL_SRC_FILES := osmand/rendering.cpp
 	
 	
 LOCAL_CFLAGS := -Wall -g
-LOCAL_LDLIBS := -ldl -llog -lcutils
+# in that case libskia_2.2.so should be in NDK folder to be properly built
+LOCAL_LDLIBS := -llog -lcutils -lskia_2.2
+##LOCAL_LDLIBS := -ldl -llog -lcutils
 
-#LOCAL_STATIC_LIBRARIES := oskia
+#LOCAL_STATIC_LIBRARIES := skia_built gif png ft2
+#LOCAL_SHARED_LIBRARIES := skia2.2
 
-LOCAL_SHARED_LIBRARIES := skia2.2
-#    libcutils \
-#    libutils \
-#    libandroid_runtime \
-#    libGLESv2
-
-# LOCAL_PRELINK_MODULE := false
+#LOCAL_PRELINK_MODULE := false
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/OsmAnd/jni/libft2.a b/OsmAnd/jni/libft2.a
new file mode 100644
index 0000000000..d30bdd0c2e
Binary files /dev/null and b/OsmAnd/jni/libft2.a differ
diff --git a/OsmAnd/jni/libgif.a b/OsmAnd/jni/libgif.a
new file mode 100644
index 0000000000..4c3e4ef6e5
Binary files /dev/null and b/OsmAnd/jni/libgif.a differ
diff --git a/OsmAnd/jni/libpng.a b/OsmAnd/jni/libpng.a
new file mode 100644
index 0000000000..8816d9d839
Binary files /dev/null and b/OsmAnd/jni/libpng.a differ
diff --git a/OsmAnd/jni/libskia2.2.so b/OsmAnd/jni/libskia2.2.so
deleted file mode 100644
index 00cbb57be0..0000000000
Binary files a/OsmAnd/jni/libskia2.2.so and /dev/null differ
diff --git a/OsmAnd/jni/libskia_2.2.so b/OsmAnd/jni/libskia_2.2.so
new file mode 100644
index 0000000000..471a64ce01
Binary files /dev/null and b/OsmAnd/jni/libskia_2.2.so differ
diff --git a/OsmAnd/jni/skia_built.a b/OsmAnd/jni/skia_built.a
new file mode 100644
index 0000000000..776035dc0c
Binary files /dev/null and b/OsmAnd/jni/skia_built.a differ
diff --git a/OsmAnd/libs/armeabi/gdb.setup b/OsmAnd/libs/armeabi/gdb.setup
deleted file mode 100644
index bc1fc5c32f..0000000000
--- a/OsmAnd/libs/armeabi/gdb.setup
+++ /dev/null
@@ -1,2 +0,0 @@
-set solib-search-path /home/victor/projects/OsmAnd/git/OsmAnd/obj/local/armeabi
-directory /home/victor/projects/android-ndk-r6b/platforms/android-8/arch-arm/usr/include /home/victor/projects/OsmAnd/git/OsmAnd/jni/jni /home/victor/projects/android//external/skia/include/core /home/victor/projects/android//external/skia/include/utils /home/victor/projects/android//external/skia/include/config /home/victor/projects/android//external/skia/include/effects /home/victor/projects/android//external/skia/include/utils/android /home/victor/projects/android//external/skia/src/core /home/victor/projects/android//system/core/include /home/victor/projects/android//frameworks/base/include /home/victor/projects/android-ndk-r6b/sources/cxx-stl/stlport/stlport /home/victor/projects/android-ndk-r6b/sources/cxx-stl/system/include
diff --git a/OsmAnd/libs/armeabi/gdbserver b/OsmAnd/libs/armeabi/gdbserver
deleted file mode 100755
index 2476e3cf9d..0000000000
Binary files a/OsmAnd/libs/armeabi/gdbserver and /dev/null differ
diff --git a/OsmAnd/libs/armeabi/libosmand.so b/OsmAnd/libs/armeabi/libosmand.so
index 6760ed9b4e..cbba39fe99 100755
Binary files a/OsmAnd/libs/armeabi/libosmand.so and b/OsmAnd/libs/armeabi/libosmand.so differ
diff --git a/OsmAnd/libs/armeabi/libskia2.2.so b/OsmAnd/libs/armeabi/libskia2.2.so
deleted file mode 100755
index 00cbb57be0..0000000000
Binary files a/OsmAnd/libs/armeabi/libskia2.2.so and /dev/null differ