miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: switched NDK platform version back to Android 4.0 for OpenSSL and applikcation build scripts, because it crashes when using Android 6.0 API, bumped OpenSSL version to force recompilation

Browse Source
This commit is contained in:
pelya
2016-07-03 03:03:37 +03:00
parent ed3471ba27
commit 63061a2fbc
22 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/jni/Makefile.prebuilt
View File

@@ -9,7 +9,7 @@ ICONV := $(foreach ARCH, $(ARCHES32), iconv/lib/$(ARCH)/libiconv.so iconv/lib/$(
ICU_LIBS := data i18n io le lx test tu uc
ICU := $(foreach ARCH, $(ARCHES32), $(foreach NAME, $(ICU_LIBS), icuuc/lib/$(ARCH)/libicu$(NAME).a))
OPENSSL := $(foreach ARCH, $(ARCHES32) $(ARCHES64), openssl/lib-$(ARCH)/libcrypto.so.sdl.0.so openssl/lib-$(ARCH)/libssl.so.sdl.0.so)
OPENSSL := $(foreach ARCH, $(ARCHES32) $(ARCHES64), openssl/lib-$(ARCH)/libcrypto.so.sdl.1.so openssl/lib-$(ARCH)/libssl.so.sdl.1.so)
LIBS := $(ICONV) $(ICU) $(OPENSSL)

2
project/jni/SettingsTemplate.mk
View File

@@ -53,4 +53,4 @@ SDL_VERSION := 1.2
#APP_CXXFLAGS := -flto
#APP_LDFLAGS := -flto
# Latest GCC got better LTO support
NDK_TOOLCHAIN_VERSION := 4.6
NDK_TOOLCHAIN_VERSION := clang

10
project/jni/application/openarena/AndroidAppSettings.cfg
View File

@@ -7,10 +7,10 @@ AppName="OpenArena"
AppFullName=ws.openarena.sdl
# Application version code (integer)
AppVersionCode=08835
AppVersionCode=08837
# Application user-visible version name (string)
AppVersionName="0.8.8.35"
AppVersionName="0.8.8.37"
# Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
# If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu
@@ -237,12 +237,12 @@ FirstStartMenuOptions=''
# Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
AppMinimumRAM=300
# GCC version, 4.6 (default) or 4.8, CLANG is not supported yet
# GCC version, or 'clang' for CLANG
NDK_TOOLCHAIN_VERSION=clang
# Specify architectures to compile, 'all' or 'y' to compile for all architectures.
# Available architectures: armeabi armeabi-v7a armeabi-v7a-hard x86 mips
MultiABI='armeabi-v7a x86 mips'
# Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a
MultiABI='armeabi-v7a x86 arm64-v8a'
# Optional shared libraries to compile - removing some of them will save space
# MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed

2
project/jni/application/openarena/engine

Submodule project/jni/application/openarena/engine updated: 3c94b5df06...92c8581b68

2
project/jni/application/openarena/vm

Submodule project/jni/application/openarena/vm updated: 84ebfb59e3...20040462fa

10
project/jni/application/pachi/AndroidAppSettings.cfg
View File

@@ -7,10 +7,10 @@ AppName="Pachi el marciano"
AppFullName=net.sourceforge.dragontech.pachi
# Application version code (integer)
AppVersionCode=1078
AppVersionCode=10792
# Application user-visible version name (string)
AppVersionName="1.07-x86"
AppVersionName="1.07-mips64"
# Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
# If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu
@@ -237,12 +237,12 @@ FirstStartMenuOptions=''
# Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
AppMinimumRAM=0
# GCC version, 4.6 (default) or 4.8, CLANG is not supported yet
# GCC version, or 'clang' for CLANG
NDK_TOOLCHAIN_VERSION=
# Specify architectures to compile, 'all' or 'y' to compile for all architectures.
# Available architectures: armeabi armeabi-v7a armeabi-v7a-hard x86 mips
MultiABI='armeabi-v7a'
# Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a
MultiABI='mips64'
# Optional shared libraries to compile - removing some of them will save space
# MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed

6
project/jni/application/pkg-config
View File

@@ -91,13 +91,13 @@ while test $# -gt 0; do
--libs|--static-libs)
case $PKG in
curl|libcurl)
echo -lcurl-sdl -l:libssl.so.sdl.0.so -l:libcrypto.so.sdl.0.so
echo -lcurl-sdl -l:libssl.so.sdl.1.so -l:libcrypto.so.sdl.1.so
;;
crypto|libcrypto)
echo -l:libcrypto.so.sdl.0.so
echo -l:libcrypto.so.sdl.1.so
;;
openssl|ssl|libssl)
echo -l:libssl.so.sdl.0.so -l:libcrypto.so.sdl.0.so
echo -l:libssl.so.sdl.1.so -l:libcrypto.so.sdl.1.so
;;
*)
echo -l$PKG

6
project/jni/application/setEnvironment-arm64-v8a.sh
View File

@@ -21,7 +21,7 @@ NDK=`readlink -f $NDK`
#echo NDK $NDK
GCCPREFIX=aarch64-linux-android
[ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9
[ -z "$PLATFORMVER" ] && PLATFORMVER=android-24
[ -z "$PLATFORMVER" ] && PLATFORMVER=android-21
LOCAL_PATH=`dirname $0`
if which realpath > /dev/null ; then
LOCAL_PATH=`realpath $LOCAL_PATH`
@@ -38,8 +38,8 @@ echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
if [ -n "$STATIC" ] ; then true
else
case $LIB in
crypto) echo crypto.so.sdl.0;;
ssl) echo ssl.so.sdl.0;;
crypto) echo crypto.so.sdl.1;;
ssl) echo ssl.so.sdl.1;;
curl) echo curl-sdl;;
*) echo $LIB;;
esac

6
project/jni/application/setEnvironment-armeabi-v7a.sh
View File

@@ -21,7 +21,7 @@ NDK=`readlink -f $NDK`
#echo NDK $NDK
GCCPREFIX=arm-linux-androideabi
[ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9
[ -z "$PLATFORMVER" ] && PLATFORMVER=android-24
[ -z "$PLATFORMVER" ] && PLATFORMVER=android-14
LOCAL_PATH=`dirname $0`
if which realpath > /dev/null ; then
LOCAL_PATH=`realpath $LOCAL_PATH`
@@ -38,8 +38,8 @@ echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
if [ -n "$STATIC" ] ; then true
else
case $LIB in
crypto) echo crypto.so.sdl.0;;
ssl) echo ssl.so.sdl.0;;
crypto) echo crypto.so.sdl.1;;
ssl) echo ssl.so.sdl.1;;
curl) echo curl-sdl;;
*) echo $LIB;;
esac

6
project/jni/application/setEnvironment-mips.sh
View File

@@ -21,7 +21,7 @@ NDK=`readlink -f $NDK`
#echo NDK $NDK
GCCPREFIX=mipsel-linux-android
[ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9
[ -z "$PLATFORMVER" ] && PLATFORMVER=android-24
[ -z "$PLATFORMVER" ] && PLATFORMVER=android-14
LOCAL_PATH=`dirname $0`
if which realpath > /dev/null ; then
LOCAL_PATH=`realpath $LOCAL_PATH`
@@ -38,8 +38,8 @@ echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
if [ -n "$STATIC" ] ; then true
else
case $LIB in
crypto) echo crypto.so.sdl.0;;
ssl) echo ssl.so.sdl.0;;
crypto) echo crypto.so.sdl.1;;
ssl) echo ssl.so.sdl.1;;
curl) echo curl-sdl;;
*) echo $LIB;;
esac

6
project/jni/application/setEnvironment-x86.sh
View File

@@ -21,7 +21,7 @@ NDK=`readlink -f $NDK`
#echo NDK $NDK
GCCPREFIX=i686-linux-android
[ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9
[ -z "$PLATFORMVER" ] && PLATFORMVER=android-24
[ -z "$PLATFORMVER" ] && PLATFORMVER=android-14
LOCAL_PATH=`dirname $0`
if which realpath > /dev/null ; then
LOCAL_PATH=`realpath $LOCAL_PATH`
@@ -38,8 +38,8 @@ echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
if [ -n "$STATIC" ] ; then true
else
case $LIB in
crypto) echo crypto.so.sdl.0;;
ssl) echo ssl.so.sdl.0;;
crypto) echo crypto.so.sdl.1;;
ssl) echo ssl.so.sdl.1;;
curl) echo curl-sdl;;
*) echo $LIB;;
esac

6
project/jni/application/setEnvironment.sh
View File

@@ -21,7 +21,7 @@ NDK=`readlink -f $NDK`
#echo NDK $NDK
GCCPREFIX=arm-linux-androideabi
[ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9
PLATFORMVER=android-24
PLATFORMVER=android-14
LOCAL_PATH=`dirname $0`
if which realpath > /dev/null ; then
LOCAL_PATH=`realpath $LOCAL_PATH`
@@ -38,8 +38,8 @@ echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
if [ -n "$STATIC" ] ; then true
else
case $LIB in
crypto) echo crypto.so.sdl.0;;
ssl) echo ssl.so.sdl.0;;
crypto) echo crypto.so.sdl.1;;
ssl) echo ssl.so.sdl.1;;
curl) echo curl-sdl;;
*) echo $LIB;;
esac

1
project/jni/openssl/.gitignore vendored
View File

@@ -1 +1,2 @@
/build
/lib-*

4
project/jni/openssl/Android.mk
View File

@@ -3,14 +3,14 @@ LOCAL_PATH:=$(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := $(notdir $(LOCAL_PATH))
LOCAL_MODULE_FILENAME := lib$(notdir $(LOCAL_PATH)).so.sdl.0 # It clashes with system libcrypto and libssl in Android 4.3 and older
LOCAL_MODULE_FILENAME := lib$(notdir $(LOCAL_PATH)).so.sdl.1 # It clashes with system libcrypto and libssl in Android 4.3 and older
ifneq (openssl,$(LOCAL_MODULE))
ifneq ($(filter arm mips x86 arm64, $(TARGET_ARCH)),)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_SRC_FILES := lib-$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so.sdl.0.so
LOCAL_SRC_FILES := lib-$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so.sdl.1.so
LOCAL_BUILT_MODULE := # This fixes a bug in NDK r10d
# NDK is buggy meh

6
project/jni/openssl/compile.sh
View File

@@ -26,14 +26,14 @@ build() {
../../setCrossEnvironment-$ARCH.sh ./Configure shared zlib --prefix=`pwd`/dist $CONFIGURE_ARCH -fPIC || exit 1
# OpenSSL build system disables parallel compilation, -j4 won't do anything
../../setCrossEnvironment-$ARCH.sh make CALC_VERSIONS='SHLIB_COMPAT=; SHLIB_SOVER=.sdl.0.so'
../../setCrossEnvironment-$ARCH.sh make CALC_VERSIONS='SHLIB_COMPAT=; SHLIB_SOVER=.sdl.1.so'
cd ../..
rm -rf lib-$ARCH
mkdir -p lib-$ARCH
cp build/$ARCH/libcrypto.so.sdl.0.so lib-${ARCH}/libcrypto.so.sdl.0.so || exit 1
cp build/$ARCH/libssl.so.sdl.0.so lib-${ARCH}/libssl.so.sdl.0.so || exit 1
cp build/$ARCH/libcrypto.so.sdl.1.so lib-${ARCH}/libcrypto.so.sdl.1.so || exit 1
cp build/$ARCH/libssl.so.sdl.1.so lib-${ARCH}/libssl.so.sdl.1.so || exit 1
}
PIDS=""

BIN
project/jni/openssl/lib-arm64-v8a/libcrypto.so.sdl.0.so
View File

Binary file not shown.

BIN
project/jni/openssl/lib-arm64-v8a/libssl.so.sdl.0.so
View File

Binary file not shown.

2
project/jni/openssl/setCrossEnvironment-arm64-v8a.sh
View File

@@ -21,7 +21,7 @@ NDK=`readlink -f $NDK`
[ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
GCCPREFIX=aarch64-linux-android
GCCVER=${GCCVER:-4.9}
PLATFORMVER=${PLATFORMVER:-android-24}
PLATFORMVER=${PLATFORMVER:-android-21}
LOCAL_PATH=`dirname $0`
if which realpath > /dev/null ; then
LOCAL_PATH=`realpath $LOCAL_PATH`

2
project/jni/openssl/setCrossEnvironment-armeabi-v7a.sh
View File

@@ -21,7 +21,7 @@ NDK=`readlink -f $NDK`
[ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
GCCPREFIX=arm-linux-androideabi
GCCVER=${GCCVER:-4.9}
PLATFORMVER=${PLATFORMVER:-android-24}
PLATFORMVER=${PLATFORMVER:-android-14}
LOCAL_PATH=`dirname $0`
if which realpath > /dev/null ; then
LOCAL_PATH=`realpath $LOCAL_PATH`

2
project/jni/openssl/setCrossEnvironment-armeabi.sh
View File

@@ -21,7 +21,7 @@ NDK=`readlink -f $NDK`
[ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
GCCPREFIX=arm-linux-androideabi
GCCVER=${GCCVER:-4.9}
PLATFORMVER=${PLATFORMVER:-android-24}
PLATFORMVER=${PLATFORMVER:-android-14}
LOCAL_PATH=`dirname $0`
if which realpath > /dev/null ; then
LOCAL_PATH=`realpath $LOCAL_PATH`

2
project/jni/openssl/setCrossEnvironment-mips.sh
View File

@@ -21,7 +21,7 @@ NDK=`readlink -f $NDK`
[ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
GCCPREFIX=mipsel-linux-android
GCCVER=${GCCVER:-4.9}
PLATFORMVER=${PLATFORMVER:-android-24}
PLATFORMVER=${PLATFORMVER:-android-14}
LOCAL_PATH=`dirname $0`
if which realpath > /dev/null ; then
LOCAL_PATH=`realpath $LOCAL_PATH`

2
project/jni/openssl/setCrossEnvironment-x86.sh
View File

@@ -21,7 +21,7 @@ NDK=`readlink -f $NDK`
[ -z "$NDK" ] && { echo "You need Andorid NDK r8 or newer installed to run this script" ; exit 1 ; }
GCCPREFIX=i686-linux-android
GCCVER=${GCCVER:-4.9}
PLATFORMVER=${PLATFORMVER:-android-24}
PLATFORMVER=${PLATFORMVER:-android-14}
LOCAL_PATH=`dirname $0`
if which realpath > /dev/null ; then
LOCAL_PATH=`realpath $LOCAL_PATH`