Merge pull request #187 from alexey-pelykh/newNdkBranch

Lost files

OsmAnd/jni/expat/Android.mk

@@ -0,0 +1,30 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+ifneq ($(OSMAND_NEON),true)
+LOCAL_MODULE := libexpat_static
+else
+LOCAL_MODULE := libexpat_static_neon
+LOCAL_ARM_NEON := true
+endif
+
+ifeq ($(OSMAND_EXPAT_LOC),)
+  OSMAND_EXPAT_LOC := ./expat_library
+endif
+ifeq ($(OSMAND_EXPAT_ABS),)
+  OSMAND_EXPAT_ABS := $(LOCAL_PATH)/expat_library
+endif
+
+LOCAL_SRC_FILES := \
+	$(OSMAND_EXPAT_LOC)/lib/xmlparse.c \
+	$(OSMAND_EXPAT_LOC)/lib/xmlrole.c \
+	$(OSMAND_EXPAT_LOC)/lib/xmltok.c
+	
+LOCAL_CFLAGS += -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions -DHAVE_EXPAT_CONFIG_H
+
+LOCAL_C_INCLUDES += \
+	$(OSMAND_EXPAT_ABS) \
+	$(OSMAND_EXPAT_ABS)/lib
+
+include $(BUILD_STATIC_LIBRARY)

OsmAnd/jni/freetype/Android.mk

@@ -0,0 +1,60 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+# compile in ARM mode, since the glyph loader/renderer is a hotspot
+# when loading complex pages in the browser
+#
+LOCAL_ARM_MODE := arm
+
+ifeq ($(OSMAND_FREETYPE_LOC),)
+  OSMAND_FREETYPE_LOC := ./freetype_library
+endif
+ifeq ($(OSMAND_FREETYPE_ABS),)
+  OSMAND_FREETYPE_ABS := $(LOCAL_PATH)/freetype_library
+endif
+
+LOCAL_SRC_FILES:= \
+	$(OSMAND_FREETYPE_LOC)/src/base/ftbbox.c \
+	$(OSMAND_FREETYPE_LOC)/src/base/ftbitmap.c \
+	$(OSMAND_FREETYPE_LOC)/src/base/ftfstype.c \
+	$(OSMAND_FREETYPE_LOC)/src/base/ftglyph.c \
+	$(OSMAND_FREETYPE_LOC)/src/base/ftlcdfil.c \
+	$(OSMAND_FREETYPE_LOC)/src/base/ftstroke.c \
+	$(OSMAND_FREETYPE_LOC)/src/base/fttype1.c \
+	$(OSMAND_FREETYPE_LOC)/src/base/ftxf86.c \
+	$(OSMAND_FREETYPE_LOC)/src/base/ftbase.c \
+	$(OSMAND_FREETYPE_LOC)/src/base/ftsystem.c \
+	$(OSMAND_FREETYPE_LOC)/src/base/ftinit.c \
+	$(OSMAND_FREETYPE_LOC)/src/base/ftgasp.c \
+	$(OSMAND_FREETYPE_LOC)/src/raster/raster.c \
+	$(OSMAND_FREETYPE_LOC)/src/sfnt/sfnt.c \
+	$(OSMAND_FREETYPE_LOC)/src/smooth/smooth.c \
+	$(OSMAND_FREETYPE_LOC)/src/autofit/autofit.c \
+	$(OSMAND_FREETYPE_LOC)/src/truetype/truetype.c \
+	$(OSMAND_FREETYPE_LOC)/src/cff/cff.c \
+	$(OSMAND_FREETYPE_LOC)/src/psnames/psnames.c \
+	$(OSMAND_FREETYPE_LOC)/src/pshinter/pshinter.c
+
+LOCAL_C_INCLUDES += \
+	$(OSMAND_FREETYPE_ABS)/builds \
+	$(OSMAND_FREETYPE_ABS)/include
+
+LOCAL_CFLAGS += -W -Wall
+LOCAL_CFLAGS += -fPIC -DPIC
+LOCAL_CFLAGS += "-DDARWIN_NO_CARBON"
+LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY"
+
+# the following is for testing only, and should not be used in final builds
+# of the product
+#LOCAL_CFLAGS += "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
+
+LOCAL_CFLAGS += -O2
+
+ifneq ($(OSMAND_NEON),true)
+LOCAL_MODULE := libft2_static
+else
+LOCAL_MODULE := libft2_static_neon
+LOCAL_ARM_NEON := true
+endif
+
+include $(BUILD_STATIC_LIBRARY)

OsmAnd/jni/gif/Android.mk

@@ -0,0 +1,27 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+ifeq ($(OSMAND_GIF_LOC),)
+  OSMAND_GIF_LOC := ./gif_library
+endif
+ifeq ($(OSMAND_GIF_ABS),)
+  OSMAND_GIF_ABS := $(LOCAL_PATH)/gif_library
+endif
+
+LOCAL_SRC_FILES := \
+	$(OSMAND_GIF_LOC)/dgif_lib.c \
+	$(OSMAND_GIF_LOC)/gifalloc.c \
+	$(OSMAND_GIF_LOC)/gif_err.c
+	
+LOCAL_C_INCLUDES += \
+	$(OSMAND_GIF_ABS)
+
+LOCAL_CFLAGS += -Wno-format -DHAVE_CONFIG_H
+
+ifneq ($(OSMAND_NEON),true)
+LOCAL_MODULE := libgif
+else
+LOCAL_MODULE := libgif_neon
+endif
+
+include $(BUILD_STATIC_LIBRARY)

OsmAnd/jni/jpeg/Android.mk

@@ -0,0 +1,83 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_ARM_MODE := arm
+
+ifeq ($(OSMAND_JPEG_LOC),)
+  OSMAND_JPEG_LOC := ./jpeg_library
+endif
+ifeq ($(OSMAND_JPEG_ABS),)
+  OSMAND_JPEG_ABS := $(LOCAL_PATH)/jpeg_library
+endif
+
+LOCAL_SRC_FILES := \
+	$(OSMAND_JPEG_LOC)/jcapimin.c \
+	$(OSMAND_JPEG_LOC)/jcapistd.c \
+	$(OSMAND_JPEG_LOC)/jccoefct.c \
+	$(OSMAND_JPEG_LOC)/jccolor.c \
+	$(OSMAND_JPEG_LOC)/jcdctmgr.c \
+	$(OSMAND_JPEG_LOC)/jchuff.c \
+	$(OSMAND_JPEG_LOC)/jcinit.c \
+	$(OSMAND_JPEG_LOC)/jcmainct.c \
+	$(OSMAND_JPEG_LOC)/jcmarker.c \
+	$(OSMAND_JPEG_LOC)/jcmaster.c \
+	$(OSMAND_JPEG_LOC)/jcomapi.c \
+	$(OSMAND_JPEG_LOC)/jcparam.c \
+	$(OSMAND_JPEG_LOC)/jcphuff.c \
+	$(OSMAND_JPEG_LOC)/jcprepct.c \
+	$(OSMAND_JPEG_LOC)/jcsample.c \
+	$(OSMAND_JPEG_LOC)/jctrans.c \
+	$(OSMAND_JPEG_LOC)/jdapimin.c \
+	$(OSMAND_JPEG_LOC)/jdapistd.c \
+	$(OSMAND_JPEG_LOC)/jdatadst.c \
+	$(OSMAND_JPEG_LOC)/jdatasrc.c \
+	$(OSMAND_JPEG_LOC)/jdcoefct.c \
+	$(OSMAND_JPEG_LOC)/jdcolor.c \
+	$(OSMAND_JPEG_LOC)/jddctmgr.c \
+	$(OSMAND_JPEG_LOC)/jdhuff.c \
+	$(OSMAND_JPEG_LOC)/jdinput.c \
+	$(OSMAND_JPEG_LOC)/jdmainct.c \
+	$(OSMAND_JPEG_LOC)/jdmarker.c \
+	$(OSMAND_JPEG_LOC)/jdmaster.c \
+	$(OSMAND_JPEG_LOC)/jdmerge.c \
+	$(OSMAND_JPEG_LOC)/jdphuff.c \
+	$(OSMAND_JPEG_LOC)/jdpostct.c \
+	$(OSMAND_JPEG_LOC)/jdsample.c \
+	$(OSMAND_JPEG_LOC)/jdtrans.c \
+	$(OSMAND_JPEG_LOC)/jerror.c \
+	$(OSMAND_JPEG_LOC)/jfdctflt.c \
+	$(OSMAND_JPEG_LOC)/jfdctfst.c \
+	$(OSMAND_JPEG_LOC)/jfdctint.c \
+	$(OSMAND_JPEG_LOC)/jidctflt.c \
+	$(OSMAND_JPEG_LOC)/jidctfst.c \
+	$(OSMAND_JPEG_LOC)/jidctint.c \
+	$(OSMAND_JPEG_LOC)/jidctred.c \
+	$(OSMAND_JPEG_LOC)/jquant1.c \
+	$(OSMAND_JPEG_LOC)/jquant2.c \
+	$(OSMAND_JPEG_LOC)/jutils.c \
+	$(OSMAND_JPEG_LOC)/jmemmgr.c \
+	$(OSMAND_JPEG_LOC)/armv6_idct.S
+
+# the original android memory manager.
+# use sdcard as libjpeg decoder's backing store
+LOCAL_SRC_FILES += \
+	$(OSMAND_JPEG_LOC)/jmem-android.c
+
+LOCAL_CFLAGS += -DAVOID_TABLES 
+LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays
+
+# enable tile based decode
+LOCAL_CFLAGS += -DANDROID_TILE_BASED_DECODE
+
+# enable armv6 idct assembly
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+LOCAL_CFLAGS += -DANDROID_ARMV6_IDCT
+endif
+
+ifneq ($(OSMAND_NEON),true)
+LOCAL_MODULE := libjpeg
+else
+LOCAL_MODULE := libjpeg_neon
+endif
+
+include $(BUILD_STATIC_LIBRARY)

OsmAnd/jni/png/Android.mk

@@ -0,0 +1,61 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+ifeq ($(OSMAND_PNG_LOC),)
+  OSMAND_PNG_LOC := ./png_library
+endif
+ifeq ($(OSMAND_PNG_ABS),)
+  OSMAND_PNG_ABS := $(LOCAL_PATH)/png_library
+endif
+
+common_SRC_FILES := \
+	$(OSMAND_PNG_LOC)/png.c \
+	$(OSMAND_PNG_LOC)/pngerror.c \
+	$(OSMAND_PNG_LOC)/pnggccrd.c \
+	$(OSMAND_PNG_LOC)/pngget.c \
+	$(OSMAND_PNG_LOC)/pngmem.c \
+	$(OSMAND_PNG_LOC)/pngpread.c \
+	$(OSMAND_PNG_LOC)/pngread.c \
+	$(OSMAND_PNG_LOC)/pngrio.c \
+	$(OSMAND_PNG_LOC)/pngrtran.c \
+	$(OSMAND_PNG_LOC)/pngrutil.c \
+	$(OSMAND_PNG_LOC)/pngset.c \
+	$(OSMAND_PNG_LOC)/pngtrans.c \
+	$(OSMAND_PNG_LOC)/pngvcrd.c \
+	$(OSMAND_PNG_LOC)/pngwio.c \
+	$(OSMAND_PNG_LOC)/pngwrite.c \
+	$(OSMAND_PNG_LOC)/pngwtran.c \
+	$(OSMAND_PNG_LOC)/pngwutil.c
+
+common_CFLAGS := -fvisibility=hidden ## -fomit-frame-pointer
+
+ifeq ($(HOST_OS),windows)
+  ifeq ($(USE_MINGW),)
+    # Case where we're building windows but not under linux (so it must be cygwin)
+    # In this case, gcc cygwin doesn't recognize -fvisibility=hidden
+    $(info libpng: Ignoring gcc flag $(common_CFLAGS) on Cygwin)
+    common_CFLAGS := 
+  endif
+endif
+
+common_C_INCLUDES += 
+
+common_COPY_HEADERS_TO := libpng
+common_COPY_HEADERS := png.h pngconf.h pngusr.h
+
+LOCAL_SRC_FILES := $(common_SRC_FILES)
+LOCAL_CFLAGS += $(common_CFLAGS)
+LOCAL_C_INCLUDES += $(common_C_INCLUDES) \
+	external/zlib
+LOCAL_SHARED_LIBRARIES := \
+	libz
+
+ifneq ($(OSMAND_NEON),true)
+LOCAL_MODULE := libpng
+else
+LOCAL_MODULE := libpng_neon
+endif
+
+include $(BUILD_STATIC_LIBRARY)
+
+