Skip to content

Commit 096a01f

Browse files
Maksim Gamarnikest31
Maksim Gamarnik
authored and
est31
committedMar 5, 2016
Update Android dependencies, -O3 optimization, remove old ARMv5 config
* Update OpenSSL (thanks @sapier, i use his patch!), Curl and SQLite3. * Remove old arm config. Almost all phones that use ARMv5 have 1 core and 256-512 RAM, it's about 2-5 FPS. * Do -O3 optimization for libs and remove -fexpensive-optimizations for Minetest (-O3 includes this! Read gcc docs). * OpenSSL fix - thanks @sapier, again.
·
5.11.00.4.14
1 parent af714c7 commit 096a01f

File tree

3 files changed

+17
-27
lines changed

3 files changed

+17
-27
lines changed
 

‎build/android/Makefile

+8-20
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,14 @@ VERSION_PATCH := $(shell cat $(ROOT)/../../CMakeLists.txt | \
3131
# Play Store actual version (16/03/15): 11
3232
ANDROID_VERSION_CODE = 13
3333

34-
################################################################################
35-
# toolchain config for arm old processors
36-
################################################################################
37-
#TARGET_HOST = arm-linux
38-
#TARGET_ABI = armeabi
39-
#TARGET_LIBDIR = armeabi
40-
#TARGET_TOOLCHAIN = arm-linux-androideabi-
41-
#TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfp
42-
#TARGET_ARCH = arm
43-
#CROSS_PREFIX = arm-linux-androideabi-
44-
#COMPILER_VERSION = 4.8
45-
#HAVE_LEVELDB = 1
46-
4734
################################################################################
4835
# toolchain config for arm new processors
4936
################################################################################
5037
TARGET_HOST = arm-linux
5138
TARGET_ABI = armeabi-v7a
5239
TARGET_LIBDIR = armeabi-v7a
5340
TARGET_TOOLCHAIN = arm-linux-androideabi-
54-
TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfpv3
41+
TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfpv3 -O3
5542
TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
5643
TARGET_ARCH = armv7
5744
CROSS_PREFIX = arm-linux-androideabi-
@@ -112,15 +99,15 @@ IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp
11299
IRRLICHT_TIMESTAMP_INT = $(ROOT)/deps/irrlicht_timestamp
113100
IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION)
114101

115-
OPENSSL_VERSION = 1.0.1p
102+
OPENSSL_VERSION = 1.0.2g
116103
OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION)
117104
OPENSSL_DIR = $(ROOT)/deps/$(OPENSSL_BASEDIR)/
118105
OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0
119106
OPENSSL_TIMESTAMP = $(OPENSSL_DIR)timestamp
120107
OPENSSL_TIMESTAMP_INT = $(ROOT)/deps/openssl_timestamp
121108
OPENSSL_URL = http://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
122109

123-
CURL_VERSION = 7.45.0
110+
CURL_VERSION = 7.47.0
124111
CURL_DIR = $(ROOT)/deps/curl-$(CURL_VERSION)
125112
CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a
126113
CURL_TIMESTAMP = $(CURL_DIR)/timestamp
@@ -147,8 +134,8 @@ ICONV_TIMESTAMP = $(ICONV_DIR)timestamp
147134
ICONV_TIMESTAMP_INT = $(ROOT)/deps/iconv_timestamp
148135
ICONV_URL_HTTP = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz
149136

150-
SQLITE3_FOLDER = sqlite-amalgamation-3090200
151-
SQLITE3_URL = http://www.sqlite.org/2015/$(SQLITE3_FOLDER).zip
137+
SQLITE3_FOLDER = sqlite-amalgamation-3100200
138+
SQLITE3_URL = http://www.sqlite.org/2016/$(SQLITE3_FOLDER).zip
152139

153140
-include $(PATHCFGFILE)
154141

@@ -338,7 +325,8 @@ $(OPENSSL_LIB): $(OPENSSL_TIMESTAMP)
338325
--toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \
339326
--install-dir=$${TOOLCHAIN}; \
340327
export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \
341-
CC=${CROSS_PREFIX}gcc ./Configure android-${TARGET_ARCH} no-idea no-seed -no-sha0 -DL_ENDIAN;\
328+
CC=${CROSS_PREFIX}gcc ./Configure enable-gmp -DL_ENDIAN -I${GMP_DIR} -L${GMP_DIR}/usr/lib android-${TARGET_ARCH};\
329+
CC=${CROSS_PREFIX}gcc ANDROID_DEV=/tmp/ndk-${TARGET_HOST} make depend; \
342330
CC=${CROSS_PREFIX}gcc ANDROID_DEV=/tmp/ndk-${TARGET_HOST} make build_libs; \
343331
touch ${OPENSSL_TIMESTAMP}; \
344332
touch ${OPENSSL_TIMESTAMP_INT}; \
@@ -612,7 +600,7 @@ $(CURL_LIB): $(CURL_TIMESTAMP) $(OPENSSL_LIB)
612600
export CXX=${CROSS_PREFIX}g++; \
613601
export TARGET_OS=OS_ANDROID_CROSSCOMPILE; \
614602
export CPPFLAGS="$${CPPFLAGS} -I${OPENSSL_DIR}/include \
615-
-L${OPENSSL_DIR} ${TARGET_CFLAGS_ADDON}"; \
603+
${TARGET_CFLAGS_ADDON}"; \
616604
export CFLAGS="$${CFLAGS} ${TARGET_CFLAGS_ADDON}"; \
617605
export LDFLAGS="$${LDFLAGS} -L${OPENSSL_DIR} ${TARGET_LDFLAGS_ADDON}"; \
618606
./configure --host=${TARGET_HOST} --disable-shared --enable-static --with-ssl; \

‎build/android/jni/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_ \
8080
ifndef NDEBUG
8181
LOCAL_CFLAGS += -g -D_DEBUG -O0 -fno-omit-frame-pointer
8282
else
83-
LOCAL_CFLAGS += -fexpensive-optimizations -O3
83+
LOCAL_CFLAGS += -O3
8484
endif
8585

8686
ifdef GPROF

‎build/android/openssl_arch.patch

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
--- openssl-1.0.1j/Configure.orig 2014-10-15 14:53:39.000000000 +0200
2-
+++ openssl-1.0.1j/Configure 2015-01-03 22:41:43.505749921 +0100
3-
@@ -407,6 +407,8 @@
1+
--- openssl-1.0.2e.orig/Configure 2015-12-03 15:04:23.000000000 +0100
2+
+++ openssl-1.0.2e/Configure 2015-12-14 21:01:40.351265968 +0100
3+
@@ -464,8 +464,10 @@
4+
# Android: linux-* but without pointers to headers and libs.
45
"android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
56
"android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
6-
"android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
77
+"android-arm","gcc:-march=armv4 -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
8-
+"android-mips32","gcc:-march=mips32 -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
8+
"android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
9+
"android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
10+
+"android-mips32","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
911

1012
#### *BSD [do see comment about ${BSDthreads} above!]
11-
"BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
13+
"BSD-generic32","gcc:-O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

0 commit comments

Comments
 (0)
Please sign in to comment.