Merge pull request #116 from virxkane/ndk-build-upd

Updated makefile for ndk-build - sync with cmake project.

Author: buggins

android/jni/Android.mk

@@ -35,7 +35,7 @@ LOCAL_CFLAGS += -Wall -Wno-unused-variable -Wno-sign-compare -Wno-write-strings
 
 LOCAL_CFLAGS += -funwind-tables -Wl,--no-merge-exidx-entries
 
-LOCAL_CFLAGS += -g -O1 -fexceptions
+LOCAL_CFLAGS += -g -O1 -fexceptions -flto
 
 CRENGINE_SRC_FILES := \
     ../../crengine/src/cp_stats.cpp \
@@ -53,12 +53,17 @@ CRENGINE_SRC_FILES := \
     ../../crengine/src/epubfmt.cpp \
     ../../crengine/src/pdbfmt.cpp \
     ../../crengine/src/wordfmt.cpp \
+    ../../crengine/src/lvopc.cpp \
+    ../../crengine/src/docxfmt.cpp \
+    ../../crengine/src/fb3fmt.cpp \
     ../../crengine/src/lvstsheet.cpp \
     ../../crengine/src/txtselector.cpp \
     ../../crengine/src/crtest.cpp \
     ../../crengine/src/lvbmpbuf.cpp \
     ../../crengine/src/lvfnt.cpp \
     ../../crengine/src/hyphman.cpp \
+    ../../crengine/src/lvfont.cpp \
+    ../../crengine/src/lvembeddedfont.cpp \
     ../../crengine/src/lvfntman.cpp \
     ../../crengine/src/lvimg.cpp \
     ../../crengine/src/crskin.cpp \
@@ -70,6 +75,12 @@ CRENGINE_SRC_FILES := \
     ../../crengine/src/wolutil.cpp \
     ../../crengine/src/crconcurrent.cpp \
     ../../crengine/src/hist.cpp \
+    ../../crengine/src/private/lvfontglyphcache.cpp \
+    ../../crengine/src/private/lvfontboldtransform.cpp \
+    ../../crengine/src/private/lvfontcache.cpp \
+    ../../crengine/src/private/lvfontdef.cpp \
+    ../../crengine/src/private/lvfreetypeface.cpp \
+    ../../crengine/src/private/lvfreetypefontman.cpp \
     ../../crengine/fc-lang/fc-lang-cat.c
 #    ../../crengine/src/cri18n.cpp
 #    ../../crengine/src/crgui.cpp \
@@ -116,7 +127,7 @@ LOCAL_STATIC_LIBRARIES := \
     local_chmlib \
     local_antiword
 
-LOCAL_LDLIBS    := -lm -llog -lz -ldl
+LOCAL_LDLIBS    := -lm -llog -lz -ldl -flto
 # 
 #LOCAL_LDLIBS    += -Wl,-Map=cr3engine.map
 #-ljnigraphics