From 76643bfc2686f33ea803142f38f122cfd7e7523f Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Tue, 1 May 2012 00:30:31 +0200
Subject: [PATCH] Build libraries for x86

---
 Osmand-kernel/.cproject                       |   2 +-
 Osmand-kernel/Makefile                        |   9 +
 Osmand-kernel/jni-prebuilt/.gitignore         |   1 +
 Osmand-kernel/osmand/.gitignore               |   2 +-
 Osmand-kernel/osmand/Android.mk               |  36 +--
 Osmand-kernel/osmand/Common.mk                |  27 +++
 Osmand-kernel/osmand/Makefile                 |  71 ++----
 Osmand-kernel/osmand/{ => src}/binaryRead.cpp |   0
 Osmand-kernel/osmand/{ => src}/common.cpp     |   0
 Osmand-kernel/osmand/{ => src}/common.h       |  10 +-
 Osmand-kernel/osmand/{ => src}/mapObjects.cpp |   0
 Osmand-kernel/osmand/{ => src}/mapObjects.h   |   0
 .../osmand/{ => src}/multipolygons.h          |   0
 Osmand-kernel/osmand/{ => src}/osmand_log.cpp |   0
 Osmand-kernel/osmand/{ => src}/osmand_log.h   |   0
 .../osmand/{ => src}/proto/osmand_odb.pb.h    |   0
 .../osmand/{ => src}/renderRules.cpp          |  14 +-
 Osmand-kernel/osmand/{ => src}/renderRules.h  |   1 +
 Osmand-kernel/osmand/{ => src}/rendering.cpp  |   0
 Osmand-kernel/osmand/{ => src}/textdraw.cpp   |   0
 Osmand-kernel/osmand/{ => src}/utf8.cpp       |   0
 Osmand-kernel/protobuf/Android.mk             |   3 +-
 Osmand-kernel/protobuf/Makefile               |  15 +-
 Osmand-kernel/skia/.gitignore                 |   1 +
 Osmand-kernel/skia/Android.mk                 | 223 +-----------------
 Osmand-kernel/skia/Common.mk                  | 209 ++++++++++++++++
 Osmand-kernel/skia/Makefile                   |  48 ++++
 27 files changed, 350 insertions(+), 322 deletions(-)
 create mode 100755 Osmand-kernel/Makefile
 create mode 100644 Osmand-kernel/osmand/Common.mk
 rename Osmand-kernel/osmand/{ => src}/binaryRead.cpp (100%)
 rename Osmand-kernel/osmand/{ => src}/common.cpp (100%)
 rename Osmand-kernel/osmand/{ => src}/common.h (98%)
 rename Osmand-kernel/osmand/{ => src}/mapObjects.cpp (100%)
 rename Osmand-kernel/osmand/{ => src}/mapObjects.h (100%)
 rename Osmand-kernel/osmand/{ => src}/multipolygons.h (100%)
 rename Osmand-kernel/osmand/{ => src}/osmand_log.cpp (100%)
 rename Osmand-kernel/osmand/{ => src}/osmand_log.h (100%)
 rename Osmand-kernel/osmand/{ => src}/proto/osmand_odb.pb.h (100%)
 rename Osmand-kernel/osmand/{ => src}/renderRules.cpp (98%)
 rename Osmand-kernel/osmand/{ => src}/renderRules.h (99%)
 rename Osmand-kernel/osmand/{ => src}/rendering.cpp (100%)
 rename Osmand-kernel/osmand/{ => src}/textdraw.cpp (100%)
 rename Osmand-kernel/osmand/{ => src}/utf8.cpp (100%)
 create mode 100644 Osmand-kernel/skia/.gitignore
 create mode 100755 Osmand-kernel/skia/Common.mk
 create mode 100644 Osmand-kernel/skia/Makefile

diff --git a/Osmand-kernel/.cproject b/Osmand-kernel/.cproject
index b9e5d45f26..075d205b54 100644
--- a/Osmand-kernel/.cproject
+++ b/Osmand-kernel/.cproject
@@ -67,7 +67,7 @@
 							</tool>
 						</toolChain>
 					</folderInfo>
-					<fileInfo id="com.android.toolchain.gcc.128294115.1197161253" name="common.cpp" rcbsApplicability="disable" resourcePath="osmand/common.cpp" toolsToInvoke="com.android.tool.compiler.g++.1543637239.697408162">
+					<fileInfo id="com.android.toolchain.gcc.128294115.1197161253" name="common.cpp" rcbsApplicability="disable" resourcePath="osmand/src/common.cpp" toolsToInvoke="com.android.tool.compiler.g++.1543637239.697408162">
 						<tool id="com.android.tool.compiler.g++.1543637239.697408162" name="Android G++" superClass="com.android.tool.compiler.g++.1543637239">
 							<option id="gnu.cpp.compiler.option.include.paths.816070414" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 								<listOptionValue builtIn="false" value="/usr/include/linux/"/>
diff --git a/Osmand-kernel/Makefile b/Osmand-kernel/Makefile
new file mode 100755
index 0000000000..5924054e33
--- /dev/null
+++ b/Osmand-kernel/Makefile
@@ -0,0 +1,9 @@
+build : 
+	cd protobuf; $(MAKE)
+	cd skia; $(MAKE)
+	cd osmand; $(MAKE)
+	
+clean : 
+	cd protobuf; $(MAKE) clean
+	cd skia; $(MAKE) clean
+	cd osmand; $(MAKE) clean
diff --git a/Osmand-kernel/jni-prebuilt/.gitignore b/Osmand-kernel/jni-prebuilt/.gitignore
index cadca2b5d0..ff9ef7973b 100644
--- a/Osmand-kernel/jni-prebuilt/.gitignore
+++ b/Osmand-kernel/jni-prebuilt/.gitignore
@@ -1,3 +1,4 @@
 x86/
 armeabi/
 armeabi-v7a/
+linux-x86/
diff --git a/Osmand-kernel/osmand/.gitignore b/Osmand-kernel/osmand/.gitignore
index 5761abcfdf..378eac25d3 100644
--- a/Osmand-kernel/osmand/.gitignore
+++ b/Osmand-kernel/osmand/.gitignore
@@ -1 +1 @@
-*.o
+build
diff --git a/Osmand-kernel/osmand/Android.mk b/Osmand-kernel/osmand/Android.mk
index 4fc3e533b3..96db692d84 100644
--- a/Osmand-kernel/osmand/Android.mk
+++ b/Osmand-kernel/osmand/Android.mk
@@ -1,16 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-
-# Set 'protobuf' folder only if it's not externally set
-ifeq ($(PROTOBUF),)
-  PROTOBUF := $(LOCAL_PATH)/../protobuf
-endif
-
-# Set 'skia' folder only if it's not externally set
-ifeq ($(OSMAND_SKIA_ABS),)
-  OSMAND_SKIA_ABS := $(LOCAL_PATH)/../skia/skia_library
-endif
+include $(LOCAL_PATH)/Common.mk
 
 # Name of the local module
 ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
@@ -20,26 +11,6 @@ LOCAL_MODULE := osmand_neon
 LOCAL_ARM_NEON := true
 endif
 
-# Include paths
-LOCAL_C_INCLUDES := $(LOCAL_PATH) \
-    $(PROTOBUF) \
-	$(LOCAL_PATH)/../skia \
-	$(OSMAND_SKIA_ABS)/include/core \
-	$(OSMAND_SKIA_ABS)/include/images \
-	$(OSMAND_SKIA_ABS)/include/utils \
-	$(OSMAND_SKIA_ABS)/include/config \
-	$(OSMAND_SKIA_ABS)/include/effects \
-	$(OSMAND_SKIA_ABS)/include/utils/android \
-	$(OSMAND_SKIA_ABS)/src/core
-	
-LOCAL_SRC_FILES := \
-	osmand_log.cpp \
-	common.cpp \
-	mapObjects.cpp \
-	renderRules.cpp \
-	rendering.cpp \
-	binaryRead.cpp
-	
 LOCAL_CFLAGS := \
 	-DGOOGLE_PROTOBUF_NO_RTTI \
 	-DSK_BUILD_FOR_ANDROID \
@@ -48,11 +19,6 @@ LOCAL_CFLAGS := \
 	-DSK_RELEASE \
 	-DGR_RELEASE=1
 	
-ifdef OSMAND_PROFILE_NATIVE_OPERATIONS
-LOCAL_CFLAGS += \
-	-DPROFILE_NATIVE_OPERATIONS
-endif
-
 ifneq ($(LOCAL_ARM_NEON),true)
 LOCAL_STATIC_LIBRARIES := \
 	proto \
diff --git a/Osmand-kernel/osmand/Common.mk b/Osmand-kernel/osmand/Common.mk
new file mode 100644
index 0000000000..9c25c7e80b
--- /dev/null
+++ b/Osmand-kernel/osmand/Common.mk
@@ -0,0 +1,27 @@
+PROTOBUF := $(LOCAL_PATH)/../protobuf
+OSMAND_SKIA_ABS := $(LOCAL_PATH)/../skia/skia_library
+
+# Include paths
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
+    $(PROTOBUF) \
+	$(LOCAL_PATH)/../skia \
+	$(OSMAND_SKIA_ABS)/include/core \
+	$(OSMAND_SKIA_ABS)/include/images \
+	$(OSMAND_SKIA_ABS)/include/utils \
+	$(OSMAND_SKIA_ABS)/include/config \
+	$(OSMAND_SKIA_ABS)/include/effects \
+	$(OSMAND_SKIA_ABS)/include/utils/android \
+	$(OSMAND_SKIA_ABS)/src/core
+	
+LOCAL_SRC_FILES := \
+	src/osmand_log.cpp \
+	src/common.cpp \
+	src/mapObjects.cpp \
+	src/renderRules.cpp \
+	src/rendering.cpp \
+	src/binaryRead.cpp
+	
+ifdef OSMAND_PROFILE_NATIVE_OPERATIONS
+LOCAL_CFLAGS += \
+	-DPROFILE_NATIVE_OPERATIONS
+endif
\ No newline at end of file
diff --git a/Osmand-kernel/osmand/Makefile b/Osmand-kernel/osmand/Makefile
index f04354b8c9..c15076f6e4 100644
--- a/Osmand-kernel/osmand/Makefile
+++ b/Osmand-kernel/osmand/Makefile
@@ -1,28 +1,14 @@
-default : all
-
-JAVA  := $$JAVA_HOME/bin/java
-JAVAC := $$JAVA_HOME/bin/javac
-CXX       := g++
-STRIP     := strip
-LIBNAME := osmand.lib
-
-#LOCAL_PATH := $(call my-dir)
 LOCAL_PATH := .
-PROTOBUF := $(LOCAL_PATH)/../protobuf
-OSMAND_SKIA_ABS := $(LOCAL_PATH)/../skia/skia_library
+PREBUILT_DIR = ../jni-prebuilt/linux-x86/
+LIBNAME := osmand.lib
+include Common.mk
 
-LOCAL_C_INCLUDES := -I$(LOCAL_PATH) \
-    -I$(PROTOBUF) \
-	-I$(LOCAL_PATH)/../skia \
-	-I$(OSMAND_SKIA_ABS)/include/core \
-	-I$(OSMAND_SKIA_ABS)/include/images \
-	-I$(OSMAND_SKIA_ABS)/include/utils \
-	-I$(OSMAND_SKIA_ABS)/include/config \
-	-I$(OSMAND_SKIA_ABS)/include/effects \
-	-I$(OSMAND_SKIA_ABS)/include/utils/android \
-	-I$(OSMAND_SKIA_ABS)/src/core
-	
-#For hash_map compilation -Wno-deprecated
+LDFLAGS = -Wl,--hash-style=both -shared
+LDLIBS = -L$(PREBUILT_DIR) -lskia -lproto
+CPP_FILE_EXTENSION = cpp
+OBJECTS = $(LOCAL_SRC_FILES:src/%.$(CPP_FILE_EXTENSION)=build/obj/%.o)
+
+C_INCLUDES := $(addprefix -I, $(LOCAL_C_INCLUDES))
 
 CPPFLAGS := \
 	-DGOOGLE_PROTOBUF_NO_RTTI \
@@ -30,31 +16,20 @@ CPPFLAGS := \
 	-DSK_RELEASE \
 	-DGR_RELEASE=1 \
 	-c -fpic -I$(JAVA_HOME)/include \
-	-DLINUX_BUILD \
-	$(LOCAL_C_INCLUDES)
+	-DHAVING_HASH \
+	$(C_INCLUDES)
+
+$(PREBUILT_DIR)/$(LIBNAME) : build/$(LIBNAME) 
+	cp build/$(LIBNAME) $(PREBUILT_DIR)/$(LIBNAME)
+
+
+build/$(LIBNAME): $(OBJECTS) $(PREBUILT_DIR)/libskia.a $(PREBUILT_DIR)/libproto.a 
+	$(CXX) $(LDFLAGS) -o build/$(LIBNAME)  $(OBJECTS) $(LDLIBS)
+	strip build/$(LIBNAME)
 	
-# LDFLAGS contains flags passed to the compiler for use during linking
-LDFLAGS = -Wl,--hash-style=both
-# LIBS contains libraries to link with
-LDLIBS = -L/home/victor/projects/OsmAnd/git/Osmand-kernel/jni-prebuilt/x86/ -lskia -lproto -lpng -ljpeg -lgif -lft2_static -lexpat_static -lrt -lm
-
-TARGET = $(shell basename `pwd`)
-SOURCES = osmand_log.cpp \
-	common.cpp \
-	mapObjects.cpp \
-	renderRules.cpp \
-	rendering.cpp \
-	binaryRead.cpp
-DEPS = $(wildcard *.h)
-OBJECTS = $(SOURCES:%.cpp=%.o)
-
-all: $(LIBNAME)
-
-$(OBJECTS): $(SOURCES) $(DEPS)
-
-$(LIBNAME): $(OBJECTS)
-	$(CXX) $(LDFLAGS) -o $(LIBNAME)  $(OBJECTS) $(LDLIBS)
-	$(STRIP) $(LIBNAME)
+build/obj/%.o : src/%.$(CPP_FILE_EXTENSION) $(LOCAL_C_INCLUDES)
+	@mkdir -p `dirname $@`
+	$(CXX) -o $@ -c src/$*.$(CPP_FILE_EXTENSION) $(CPPFLAGS)
 	
 clean:
-	$(RM) $(OBJECTS) $(TARGET) 
\ No newline at end of file
+	$(RM) $(OBJECTS) build/$(LIBNAME)
\ No newline at end of file
diff --git a/Osmand-kernel/osmand/binaryRead.cpp b/Osmand-kernel/osmand/src/binaryRead.cpp
similarity index 100%
rename from Osmand-kernel/osmand/binaryRead.cpp
rename to Osmand-kernel/osmand/src/binaryRead.cpp
diff --git a/Osmand-kernel/osmand/common.cpp b/Osmand-kernel/osmand/src/common.cpp
similarity index 100%
rename from Osmand-kernel/osmand/common.cpp
rename to Osmand-kernel/osmand/src/common.cpp
diff --git a/Osmand-kernel/osmand/common.h b/Osmand-kernel/osmand/src/common.h
similarity index 98%
rename from Osmand-kernel/osmand/common.h
rename to Osmand-kernel/osmand/src/common.h
index 9b83763d47..f4487b6f9d 100644
--- a/Osmand-kernel/osmand/common.h
+++ b/Osmand-kernel/osmand/src/common.h
@@ -4,9 +4,12 @@
 #include <jni.h>
 #include <string>
 #include <vector>
+
 #include <hash_map>
 #include <hash_set>
-#ifdef LINUX_BUILD
+
+#ifdef HAVING_HASH
+
 #define HMAP __gnu_cxx
 namespace __gnu_cxx {
   template<>
@@ -36,8 +39,11 @@ namespace __gnu_cxx {
 }
 
 #else
-#define HMAP std
+
+#define HMAP
+
 #endif
+
 using namespace std;
 
 #include <SkPath.h>
diff --git a/Osmand-kernel/osmand/mapObjects.cpp b/Osmand-kernel/osmand/src/mapObjects.cpp
similarity index 100%
rename from Osmand-kernel/osmand/mapObjects.cpp
rename to Osmand-kernel/osmand/src/mapObjects.cpp
diff --git a/Osmand-kernel/osmand/mapObjects.h b/Osmand-kernel/osmand/src/mapObjects.h
similarity index 100%
rename from Osmand-kernel/osmand/mapObjects.h
rename to Osmand-kernel/osmand/src/mapObjects.h
diff --git a/Osmand-kernel/osmand/multipolygons.h b/Osmand-kernel/osmand/src/multipolygons.h
similarity index 100%
rename from Osmand-kernel/osmand/multipolygons.h
rename to Osmand-kernel/osmand/src/multipolygons.h
diff --git a/Osmand-kernel/osmand/osmand_log.cpp b/Osmand-kernel/osmand/src/osmand_log.cpp
similarity index 100%
rename from Osmand-kernel/osmand/osmand_log.cpp
rename to Osmand-kernel/osmand/src/osmand_log.cpp
diff --git a/Osmand-kernel/osmand/osmand_log.h b/Osmand-kernel/osmand/src/osmand_log.h
similarity index 100%
rename from Osmand-kernel/osmand/osmand_log.h
rename to Osmand-kernel/osmand/src/osmand_log.h
diff --git a/Osmand-kernel/osmand/proto/osmand_odb.pb.h b/Osmand-kernel/osmand/src/proto/osmand_odb.pb.h
similarity index 100%
rename from Osmand-kernel/osmand/proto/osmand_odb.pb.h
rename to Osmand-kernel/osmand/src/proto/osmand_odb.pb.h
diff --git a/Osmand-kernel/osmand/renderRules.cpp b/Osmand-kernel/osmand/src/renderRules.cpp
similarity index 98%
rename from Osmand-kernel/osmand/renderRules.cpp
rename to Osmand-kernel/osmand/src/renderRules.cpp
index 65fdf57d8e..c7547708fd 100644
--- a/Osmand-kernel/osmand/renderRules.cpp
+++ b/Osmand-kernel/osmand/src/renderRules.cpp
@@ -6,14 +6,10 @@
 #include <iterator>
 #include <string>
 #include <vector>
-#ifdef LINUX_BUILD
-#include <ext/hash_map>
-using namespace __gnu_cxx;
-#else
-#include <hash_map>
-#endif
-#include "renderRules.h"
 #include "common.h"
+#include "renderRules.h"
+
+
 
 jclass ListClass;
 jmethodID List_size;
@@ -56,7 +52,7 @@ RenderingRuleProperty* RenderingRulesStorage::getProperty(int i) {
 }
 
 RenderingRule* RenderingRulesStorage::getRule(int state, int itag, int ivalue) {
-	hash_map<int, RenderingRule>::iterator it = (tagValueGlobalRules[state]).find(
+	HMAP::hash_map<int, RenderingRule>::iterator it = (tagValueGlobalRules[state]).find(
 			(itag << SHIFT_TAG_VAL) | ivalue);
 	if (it == tagValueGlobalRules[state].end()) {
 		return NULL;
@@ -65,7 +61,7 @@ RenderingRule* RenderingRulesStorage::getRule(int state, int itag, int ivalue) {
 }
 
 RenderingRuleProperty* RenderingRulesStorage::getProperty(const char* st) {
-	hash_map<std::string, RenderingRuleProperty*>::iterator i = propertyMap.find(st);
+	HMAP::hash_map<std::string, RenderingRuleProperty*>::iterator i = propertyMap.find(st);
 	if (i == propertyMap.end()) {
 		return NULL;
 	}
diff --git a/Osmand-kernel/osmand/renderRules.h b/Osmand-kernel/osmand/src/renderRules.h
similarity index 99%
rename from Osmand-kernel/osmand/renderRules.h
rename to Osmand-kernel/osmand/src/renderRules.h
index 065a2ca868..00d80dc97e 100644
--- a/Osmand-kernel/osmand/renderRules.h
+++ b/Osmand-kernel/osmand/src/renderRules.h
@@ -3,6 +3,7 @@
 
 #include <jni.h>
 #include <string>
+#include "common.h"
 #include "mapObjects.h"
 
 class RenderingRuleProperty
diff --git a/Osmand-kernel/osmand/rendering.cpp b/Osmand-kernel/osmand/src/rendering.cpp
similarity index 100%
rename from Osmand-kernel/osmand/rendering.cpp
rename to Osmand-kernel/osmand/src/rendering.cpp
diff --git a/Osmand-kernel/osmand/textdraw.cpp b/Osmand-kernel/osmand/src/textdraw.cpp
similarity index 100%
rename from Osmand-kernel/osmand/textdraw.cpp
rename to Osmand-kernel/osmand/src/textdraw.cpp
diff --git a/Osmand-kernel/osmand/utf8.cpp b/Osmand-kernel/osmand/src/utf8.cpp
similarity index 100%
rename from Osmand-kernel/osmand/utf8.cpp
rename to Osmand-kernel/osmand/src/utf8.cpp
diff --git a/Osmand-kernel/protobuf/Android.mk b/Osmand-kernel/protobuf/Android.mk
index d132a9791c..08cecc231c 100644
--- a/Osmand-kernel/protobuf/Android.mk
+++ b/Osmand-kernel/protobuf/Android.mk
@@ -1,6 +1,7 @@
 LOCAL_PATH := $(call my-dir)
-include Common.mk
+
 include $(CLEAR_VARS)
+include $(LOCAL_PATH)/Common.mk
 
 ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
 LOCAL_MODULE := proto
diff --git a/Osmand-kernel/protobuf/Makefile b/Osmand-kernel/protobuf/Makefile
index c69bf17cd2..184879ef7a 100644
--- a/Osmand-kernel/protobuf/Makefile
+++ b/Osmand-kernel/protobuf/Makefile
@@ -1,16 +1,21 @@
 include Common.mk
-LIBNAME := build/libproto.a
+LIBNAME := libproto.a
+PREBUILT_DIR = ../jni-prebuilt/linux-x86/
 OBJECTS = $(LOCAL_SRC_FILES:%.cc=build/obj/%.o)
 CPPFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI -I.
 LDLIBS = -lpthread
-LDFLAGS = -shared
 
-$(LIBNAME): $(OBJECTS) 
-	ar -rf $(LIBNAME) $(OBJECTS)
+target : $(PREBUILT_DIR)/$(LIBNAME)
+
+$(PREBUILT_DIR)/$(LIBNAME) : build/$(LIBNAME) 
+	cp build/$(LIBNAME) $(PREBUILT_DIR)/$(LIBNAME) 
+
+build/$(LIBNAME): $(OBJECTS) 
+	ar -rf build/$(LIBNAME) $(OBJECTS)
 	
 build/obj/%.o :
 	@mkdir -p `dirname $@`
 	$(CXX) -o $@ -c $*.cc $(CPPFLAGS)
 
 clean:
-	$(RM) $(OBJECTS)
\ No newline at end of file
+	$(RM) $(OBJECTS) build/$(LIBNAME)
\ No newline at end of file
diff --git a/Osmand-kernel/skia/.gitignore b/Osmand-kernel/skia/.gitignore
new file mode 100644
index 0000000000..567609b123
--- /dev/null
+++ b/Osmand-kernel/skia/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/Osmand-kernel/skia/Android.mk b/Osmand-kernel/skia/Android.mk
index aaaf839a2a..0b3e83d013 100755
--- a/Osmand-kernel/skia/Android.mk
+++ b/Osmand-kernel/skia/Android.mk
@@ -3,6 +3,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
+include $(LOCAL_PATH)/Common.mk
 
 ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
 LOCAL_MODULE := skia
@@ -11,28 +12,6 @@ LOCAL_MODULE := skia_neon
 LOCAL_ARM_NEON := true
 endif
 
-ifeq ($(OSMAND_SKIA_LOC),)
-  OSMAND_SKIA_LOC := ./skia_library
-endif
-ifeq ($(OSMAND_SKIA_ABS),)
-  OSMAND_SKIA_ABS := $(LOCAL_PATH)/skia_library
-endif
-
-ifeq ($(OSMAND_FREETYPE_ABS),)
-  OSMAND_FREETYPE_ABS := $(LOCAL_PATH)/../freetype/freetype_library
-endif
-ifeq ($(OSMAND_PNG_ABS),)
-  OSMAND_PNG_ABS := $(LOCAL_PATH)/../png/png_library
-endif
-ifeq ($(OSMAND_GIF_ABS),)
-  OSMAND_GIF_ABS := $(LOCAL_PATH)/../gif/gif_library
-endif
-ifeq ($(OSMAND_EXPAT_ABS),)
-  OSMAND_EXPAT_ABS := $(LOCAL_PATH)/../expat/expat_library
-endif
-ifeq ($(OSMAND_JPEG_ABS),)
-  OSMAND_JPEG_ABS := $(LOCAL_PATH)/../jpeg/jpeg_library
-endif
 
 ifneq ($(OSMAND_USE_PREBUILT),true)
 
@@ -52,165 +31,8 @@ ifeq ($(LOCAL_ARM_NEON),true)
 	LOCAL_CFLAGS += -D__ARM_HAVE_NEON
 endif
 
-LOCAL_SRC_FILES := \
-	$(OSMAND_SKIA_LOC)/src/core/Sk64.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkAAClip.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkAdvancedTypefaceMetrics.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkAlphaRuns.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBitmap.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBitmapProcShader.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBitmapProcState.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBitmapProcState_matrixProcs.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBitmapSampler.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBitmap_scroll.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBlitMask_D32.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBlitRow_D16.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBlitRow_D32.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBlitRow_D4444.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBlitter.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBlitter_4444.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBlitter_A1.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBlitter_A8.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBlitter_ARGB32.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBlitter_RGB16.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBlitter_Sprite.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkBuffer.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkCanvas.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkChunkAlloc.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkClampRange.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkClipStack.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkColor.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkColorFilter.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkColorTable.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkComposeShader.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkConcaveToTriangles.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkConfig8888.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkCordic.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkCubicClipper.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkData.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkDebug.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkDeque.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkDevice.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkDeviceProfile.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkDither.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkDraw.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkEdgeBuilder.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkEdgeClipper.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkEdge.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkFilterProc.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkFlattenable.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkFloat.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkFloatBits.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkFontHost.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkGeometry.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkGlyphCache.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkGraphics.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkLineClipper.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkMallocPixelRef.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkMask.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkMaskFilter.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkMath.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkMatrix.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkMetaData.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkMMapStream.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkPackBits.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkPaint.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkPath.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkPathEffect.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkPathHeap.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkPathMeasure.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkPicture.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkPictureFlat.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkPicturePlayback.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkPictureRecord.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkPixelRef.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkPoint.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkProcSpriteBlitter.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkPtrRecorder.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkQuadClipper.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkRasterClip.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkRasterizer.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkRect.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkRefDict.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkRegion.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkRegion_path.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkScalar.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkScalerContext.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkScan.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkScan_AntiPath.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkScan_Antihair.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkScan_Hairline.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkScan_Path.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkShader.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkShape.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkSpriteBlitter_ARGB32.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkSpriteBlitter_RGB16.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkStream.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkString.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkStroke.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkStrokerPriv.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkTSearch.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkTypeface.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkTypefaceCache.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkUnPreMultiply.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkUtils.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkFlate.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkWriter32.cpp \
-	$(OSMAND_SKIA_LOC)/src/core/SkXfermode.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/Sk1DPathEffect.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/Sk2DPathEffect.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkAvoidXfermode.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkArithmeticMode.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkBitmapCache.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkBlurDrawLooper.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkBlurImageFilter.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkBlurMask.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkBlurMaskFilter.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkColorFilters.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkColorMatrixFilter.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkCornerPathEffect.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkDashPathEffect.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkDiscretePathEffect.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkEffects.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkEmbossMask.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkEmbossMaskFilter.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkGradientShader.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkGroupShape.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkKernel33MaskFilter.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkLayerDrawLooper.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkLayerRasterizer.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkMorphologyImageFilter.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkPaintFlagsDrawFilter.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkPixelXorXfermode.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkPorterDuff.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkRectShape.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkTableColorFilter.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkTableMaskFilter.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkTestImageFilters.cpp \
-	$(OSMAND_SKIA_LOC)/src/effects/SkTransparentShader.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/bmpdecoderhelper.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkBitmapRegionDecoder.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkCreateRLEPixelRef.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkFDStream.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkFlipPixelRef.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder_Factory.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder_libbmp.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder_libgif.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder_libico.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder_libjpeg.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder_libpng.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder_wbmp.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkImageEncoder.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkImageEncoder_Factory.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkImageRef.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkImageRefPool.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkImageRef_GlobalPool.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkJpegUtility.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkMovie.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkMovie_gif.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkPageFlipper.cpp \
-	$(OSMAND_SKIA_LOC)/src/images/SkScaledBitmapSampler.cpp \
+# This file is replacement of $(OSMAND_SKIA_LOC)/src/ports/FontHostConfiguration_android.cpp 
+LOCAL_SRC_FILES += \
 	$(OSMAND_SKIA_LOC)/src/ports/SkDebug_android.cpp \
 	$(OSMAND_SKIA_LOC)/src/ports/SkGlobalInitialization_default.cpp \
 	$(OSMAND_SKIA_LOC)/src/ports/SkFontHost_FreeType.cpp \
@@ -222,30 +44,6 @@ LOCAL_SRC_FILES := \
 	$(OSMAND_SKIA_LOC)/src/ports/SkOSFile_stdio.cpp \
 	$(OSMAND_SKIA_LOC)/src/ports/SkThread_pthread.cpp \
 	$(OSMAND_SKIA_LOC)/src/ports/SkTime_Unix.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkBase64.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkBoundaryPatch.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkCamera.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkColorMatrix.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkCubicInterval.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkCullPoints.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkDeferredCanvas.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkDumpCanvas.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkInterpolator.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkLayer.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkMatrix44.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkMeshUtils.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkNinePatch.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkNWayCanvas.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkOSFile.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkParse.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkParseColor.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkParsePath.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkProxyCanvas.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkSfntUtils.cpp \
-	$(OSMAND_SKIA_LOC)/src/utils/SkUnitMappers.cpp
-
-# This file is replacement of $(OSMAND_SKIA_LOC)/src/ports/FontHostConfiguration_android.cpp 
-LOCAL_SRC_FILES += \
 	FontHostConfiguration_android.cpp
 LOCAL_C_INCLUDES += \
 	$(OSMAND_SKIA_ABS)/src/ports
@@ -293,21 +91,6 @@ LOCAL_STATIC_LIBRARIES += \
 	libexpat_static
 endif
 
-LOCAL_C_INCLUDES += \
-	$(LOCAL_PATH) \
-	$(OSMAND_SKIA_ABS)/src/core \
-	$(OSMAND_SKIA_ABS)/include/core \
-	$(OSMAND_SKIA_ABS)/include/config \
-	$(OSMAND_SKIA_ABS)/include/effects \
-	$(OSMAND_SKIA_ABS)/include/images \
-	$(OSMAND_SKIA_ABS)/include/utils \
-	$(OSMAND_SKIA_ABS)/include/xml \
-	$(OSMAND_FREETYPE_ABS)/include \
-	$(OSMAND_PNG_ABS) \
-	$(OSMAND_GIF_ABS) \
-	$(OSMAND_EXPAT_ABS)/lib \
-	$(OSMAND_JPEG_ABS)
-
 ifeq ($(NO_FALLBACK_FONT),true)
 	LOCAL_CFLAGS += -DNO_FALLBACK_FONT
 endif
diff --git a/Osmand-kernel/skia/Common.mk b/Osmand-kernel/skia/Common.mk
new file mode 100755
index 0000000000..436f417157
--- /dev/null
+++ b/Osmand-kernel/skia/Common.mk
@@ -0,0 +1,209 @@
+OSMAND_SKIA_LOC := ./skia_library
+
+OSMAND_SKIA_ABS := $(LOCAL_PATH)/skia_library
+
+OSMAND_FREETYPE_ABS := $(LOCAL_PATH)/../freetype/freetype_library
+
+OSMAND_PNG_ABS := $(LOCAL_PATH)/../png/png_library
+
+OSMAND_GIF_ABS := $(LOCAL_PATH)/../gif/gif_library
+
+OSMAND_EXPAT_ABS := $(LOCAL_PATH)/../expat/expat_library
+
+OSMAND_JPEG_ABS := $(LOCAL_PATH)/../jpeg/jpeg_library
+
+LOCAL_SRC_FILES := \
+	$(OSMAND_SKIA_LOC)/src/core/Sk64.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkAAClip.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkAdvancedTypefaceMetrics.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkAlphaRuns.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBitmap.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBitmapProcShader.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBitmapProcState.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBitmapProcState_matrixProcs.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBitmapSampler.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBitmap_scroll.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBlitMask_D32.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBlitRow_D16.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBlitRow_D32.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBlitRow_D4444.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBlitter.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBlitter_4444.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBlitter_A1.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBlitter_A8.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBlitter_ARGB32.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBlitter_RGB16.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBlitter_Sprite.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkBuffer.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkCanvas.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkChunkAlloc.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkClampRange.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkClipStack.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkColor.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkColorFilter.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkColorTable.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkComposeShader.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkConcaveToTriangles.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkConfig8888.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkCordic.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkCubicClipper.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkData.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkDebug.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkDeque.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkDevice.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkDeviceProfile.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkDither.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkDraw.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkEdgeBuilder.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkEdgeClipper.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkEdge.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkFilterProc.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkFlattenable.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkFloat.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkFloatBits.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkFontHost.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkGeometry.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkGlyphCache.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkGraphics.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkLineClipper.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkMallocPixelRef.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkMask.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkMaskFilter.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkMath.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkMatrix.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkMetaData.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkMMapStream.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkPackBits.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkPaint.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkPath.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkPathEffect.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkPathHeap.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkPathMeasure.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkPicture.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkPictureFlat.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkPicturePlayback.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkPictureRecord.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkPixelRef.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkPoint.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkProcSpriteBlitter.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkPtrRecorder.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkQuadClipper.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkRasterClip.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkRasterizer.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkRect.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkRefDict.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkRegion.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkRegion_path.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkScalar.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkScalerContext.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkScan.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkScan_AntiPath.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkScan_Antihair.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkScan_Hairline.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkScan_Path.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkShader.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkShape.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkSpriteBlitter_ARGB32.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkSpriteBlitter_RGB16.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkStream.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkString.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkStroke.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkStrokerPriv.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkTSearch.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkTypeface.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkTypefaceCache.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkUnPreMultiply.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkUtils.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkFlate.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkWriter32.cpp \
+	$(OSMAND_SKIA_LOC)/src/core/SkXfermode.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/Sk1DPathEffect.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/Sk2DPathEffect.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkAvoidXfermode.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkArithmeticMode.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkBitmapCache.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkBlurDrawLooper.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkBlurImageFilter.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkBlurMask.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkBlurMaskFilter.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkColorFilters.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkColorMatrixFilter.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkCornerPathEffect.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkDashPathEffect.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkDiscretePathEffect.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkEffects.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkEmbossMask.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkEmbossMaskFilter.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkGradientShader.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkGroupShape.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkKernel33MaskFilter.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkLayerDrawLooper.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkLayerRasterizer.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkMorphologyImageFilter.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkPaintFlagsDrawFilter.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkPixelXorXfermode.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkPorterDuff.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkRectShape.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkTableColorFilter.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkTableMaskFilter.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkTestImageFilters.cpp \
+	$(OSMAND_SKIA_LOC)/src/effects/SkTransparentShader.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/bmpdecoderhelper.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkBitmapRegionDecoder.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkCreateRLEPixelRef.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkFDStream.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkFlipPixelRef.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder_Factory.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder_libbmp.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder_libgif.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder_libico.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder_libjpeg.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder_libpng.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkImageDecoder_wbmp.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkImageEncoder.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkImageEncoder_Factory.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkImageRef.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkImageRefPool.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkImageRef_GlobalPool.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkJpegUtility.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkMovie.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkMovie_gif.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkPageFlipper.cpp \
+	$(OSMAND_SKIA_LOC)/src/images/SkScaledBitmapSampler.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkBase64.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkBoundaryPatch.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkCamera.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkColorMatrix.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkCubicInterval.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkCullPoints.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkDeferredCanvas.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkDumpCanvas.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkInterpolator.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkLayer.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkMatrix44.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkMeshUtils.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkNinePatch.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkNWayCanvas.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkOSFile.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkParse.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkParseColor.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkParsePath.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkProxyCanvas.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkSfntUtils.cpp \
+	$(OSMAND_SKIA_LOC)/src/utils/SkUnitMappers.cpp
+
+LOCAL_C_INCLUDES += \
+	$(LOCAL_PATH) \
+	$(OSMAND_SKIA_ABS)/src/core \
+	$(OSMAND_SKIA_ABS)/include/core \
+	$(OSMAND_SKIA_ABS)/include/config \
+	$(OSMAND_SKIA_ABS)/include/effects \
+	$(OSMAND_SKIA_ABS)/include/images \
+	$(OSMAND_SKIA_ABS)/include/utils \
+	$(OSMAND_SKIA_ABS)/include/xml \
+	$(OSMAND_FREETYPE_ABS)/include \
+	$(OSMAND_PNG_ABS) \
+	$(OSMAND_GIF_ABS) \
+	$(OSMAND_EXPAT_ABS)/lib \
+	$(OSMAND_JPEG_ABS)
diff --git a/Osmand-kernel/skia/Makefile b/Osmand-kernel/skia/Makefile
new file mode 100644
index 0000000000..18af425d61
--- /dev/null
+++ b/Osmand-kernel/skia/Makefile
@@ -0,0 +1,48 @@
+LOCAL_PATH = .
+include Common.mk
+
+PREBUILT_DIR = ../jni-prebuilt/linux-x86/
+LIBNAME := libskia.a
+
+CPP_FILE_EXTENSION = cpp
+LOCAL_SRC_FILES += \
+	$(OSMAND_SKIA_LOC)/src/opts/SkBlitRow_opts_none.cpp \
+	$(OSMAND_SKIA_LOC)/src/opts/SkBitmapProcState_opts_none.cpp \
+	$(OSMAND_SKIA_LOC)/src/opts/SkUtils_opts_none.cpp \
+	$(OSMAND_SKIA_LOC)/src/ports/SkThread_pthread.cpp \
+	$(OSMAND_SKIA_LOC)/src/ports/SkDebug_stdio.cpp \
+	$(OSMAND_SKIA_LOC)/src/ports/SkFontHost_FreeType.cpp \
+	$(OSMAND_SKIA_LOC)/src/ports/SkOSFile_stdio.cpp \
+	$(OSMAND_SKIA_LOC)/src/ports/SkTime_Unix.cpp \
+	$(OSMAND_SKIA_LOC)/src/ports/SkMemory_malloc.cpp \
+	$(OSMAND_SKIA_LOC)/src/ports/SkFontHost_gamma.cpp \
+	$(OSMAND_SKIA_LOC)/src/ports/SkGlobalInitialization_default.cpp
+	
+OBJECTS = $(LOCAL_SRC_FILES:%.$(CPP_FILE_EXTENSION)=build/obj/%.o)
+C_INCLUDES := $(addprefix -I, $(LOCAL_C_INCLUDES))
+
+CPPFLAGS := -DSK_RELEASE \
+	-DGR_RELEASE=1 \
+	-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 \
+	-DNDEBUG \
+	-fno-rtti \
+	-fno-exceptions \
+	$(C_INCLUDES)
+	
+LDLIBS = -lpthread
+
+target : $(PREBUILT_DIR)/$(LIBNAME)
+
+$(PREBUILT_DIR)/$(LIBNAME) : build/$(LIBNAME) 
+	cp build/$(LIBNAME) $(PREBUILT_DIR)/$(LIBNAME)
+
+build/$(LIBNAME): $(OBJECTS) 
+	ar -rf build/$(LIBNAME) $(OBJECTS)
+	cp build/$(LIBNAME) ../jni-prebuilt/linux-x86/$(LIBNAME)
+	
+build/obj/%.o :
+	@mkdir -p `dirname $@`
+	$(CXX) -o $@ -c $*.$(CPP_FILE_EXTENSION) $(CPPFLAGS)
+
+clean:
+	$(RM) $(OBJECTS) build/$(LIBNAME)
\ No newline at end of file