jni: NDKr3 is now used

git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1322 6a642e6f-84f6-412e-ac94-c4a38d5a04b0

jni/Android.mk

@@ -0,0 +1,16 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE                  := DeflatingDecompressor
+LOCAL_SRC_FILES               := DeflatingDecompressor/DeflatingDecompressor.cpp
+LOCAL_LDLIBS                  := -lz
+
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE                  := LineBreak
+LOCAL_SRC_FILES               := LineBreak/LineBreaker.cpp LineBreak/liblinebreak-2.0/linebreak.c LineBreak/liblinebreak-2.0/linebreakdata.c LineBreak/liblinebreak-2.0/linebreakdef.c
+
+include $(BUILD_SHARED_LIBRARY)

native/apps/DeflatingDecompressor/Application.mk

@@ -1,2 +0,0 @@
-APP_PROJECT_PATH := /Users/geometer/src/projects/FBReaderJ
-APP_MODULES      := DeflatingDecompressor

native/apps/LineBreak/Application.mk

@@ -1,2 +0,0 @@
-APP_PROJECT_PATH := /Users/geometer/src/projects/FBReaderJ
-APP_MODULES      := LineBreak

native/sources/DeflatingDecompressor/Android.mk

@@ -1,10 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE                  := DeflatingDecompressor
-LOCAL_SRC_FILES               := DeflatingDecompressor.cpp
-LOCAL_LDLIBS                  := -L$(SYSROOT)/usr/lib -lz
-LOCAL_ALLOW_UNDEFINED_SYMBOLS := false
-
-include $(BUILD_SHARED_LIBRARY)

native/sources/LineBreak/Android.mk

@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE                  := LineBreak
-LOCAL_SRC_FILES               := LineBreaker.cpp liblinebreak-2.0/linebreak.c liblinebreak-2.0/linebreakdata.c liblinebreak-2.0/linebreakdef.c
-LOCAL_ALLOW_UNDEFINED_SYMBOLS := false
-
-include $(BUILD_SHARED_LIBRARY)

packageTool.sh

@@ -25,7 +25,7 @@ buildSourceArchive() {
   ant clean
   rm -rf $dir $archive
   mkdir $dir
-  cp -r data icons src native build.xml AndroidManifest.xml* res *.properties createRawResources.py libs HowToBuild $0 VERSION $dir
+  cp -r data icons src jni build.xml AndroidManifest.xml* res *.properties createRawResources.py libs HowToBuild $0 VERSION $dir
   rm -rf `find $dir -name .svn`
   zip -rq $archive $dir/*
   rm -rf $dir