diff --git a/project/jni/Makefile.prebuilt b/project/jni/Makefile.prebuilt index 8747d16c0..e3daa851a 100644 --- a/project/jni/Makefile.prebuilt +++ b/project/jni/Makefile.prebuilt @@ -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) diff --git a/project/jni/SettingsTemplate.mk b/project/jni/SettingsTemplate.mk index 6810113b1..c7584177c 100644 --- a/project/jni/SettingsTemplate.mk +++ b/project/jni/SettingsTemplate.mk @@ -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 diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg index e9148fe76..f3d97c839 100644 --- a/project/jni/application/openarena/AndroidAppSettings.cfg +++ b/project/jni/application/openarena/AndroidAppSettings.cfg @@ -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 diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index 3c94b5df0..92c8581b6 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit 3c94b5df06ffe8755ce213a495ee99283714f3c1 +Subproject commit 92c8581b68507ca59446c5e0644d5e5499c504fa diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 84ebfb59e..20040462f 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 84ebfb59e31c24134b865cbe0d0fa1eb7aa7c57d +Subproject commit 20040462faf0a78ebd4b813d35127416686e65d6 diff --git a/project/jni/application/pachi/AndroidAppSettings.cfg b/project/jni/application/pachi/AndroidAppSettings.cfg index 6f2143f60..30284d7ee 100644 --- a/project/jni/application/pachi/AndroidAppSettings.cfg +++ b/project/jni/application/pachi/AndroidAppSettings.cfg @@ -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 diff --git a/project/jni/application/pkg-config b/project/jni/application/pkg-config index 3662fd779..d6c423661 100755 --- a/project/jni/application/pkg-config +++ b/project/jni/application/pkg-config @@ -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 diff --git a/project/jni/application/setEnvironment-arm64-v8a.sh b/project/jni/application/setEnvironment-arm64-v8a.sh index f81ad461d..3b627a320 100755 --- a/project/jni/application/setEnvironment-arm64-v8a.sh +++ b/project/jni/application/setEnvironment-arm64-v8a.sh @@ -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 diff --git a/project/jni/application/setEnvironment-armeabi-v7a.sh b/project/jni/application/setEnvironment-armeabi-v7a.sh index af5c60e30..f0c0e02c1 100755 --- a/project/jni/application/setEnvironment-armeabi-v7a.sh +++ b/project/jni/application/setEnvironment-armeabi-v7a.sh @@ -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 diff --git a/project/jni/application/setEnvironment-mips.sh b/project/jni/application/setEnvironment-mips.sh index dac520bfd..2f8bb834b 100755 --- a/project/jni/application/setEnvironment-mips.sh +++ b/project/jni/application/setEnvironment-mips.sh @@ -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 diff --git a/project/jni/application/setEnvironment-x86.sh b/project/jni/application/setEnvironment-x86.sh index c21e07e09..87bac31dc 100755 --- a/project/jni/application/setEnvironment-x86.sh +++ b/project/jni/application/setEnvironment-x86.sh @@ -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 diff --git a/project/jni/application/setEnvironment.sh b/project/jni/application/setEnvironment.sh index 4ebcf4a87..09670ed23 100755 --- a/project/jni/application/setEnvironment.sh +++ b/project/jni/application/setEnvironment.sh @@ -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 diff --git a/project/jni/openssl/.gitignore b/project/jni/openssl/.gitignore index 796b96d1c..6ffe84975 100644 --- a/project/jni/openssl/.gitignore +++ b/project/jni/openssl/.gitignore @@ -1 +1,2 @@ /build +/lib-* diff --git a/project/jni/openssl/Android.mk b/project/jni/openssl/Android.mk index 7a3f7b77c..8f2a0cd9a 100644 --- a/project/jni/openssl/Android.mk +++ b/project/jni/openssl/Android.mk @@ -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 diff --git a/project/jni/openssl/compile.sh b/project/jni/openssl/compile.sh index 5aab72da9..193a3de98 100755 --- a/project/jni/openssl/compile.sh +++ b/project/jni/openssl/compile.sh @@ -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="" diff --git a/project/jni/openssl/lib-arm64-v8a/libcrypto.so.sdl.0.so b/project/jni/openssl/lib-arm64-v8a/libcrypto.so.sdl.0.so deleted file mode 100755 index 966c195c3..000000000 Binary files a/project/jni/openssl/lib-arm64-v8a/libcrypto.so.sdl.0.so and /dev/null differ diff --git a/project/jni/openssl/lib-arm64-v8a/libssl.so.sdl.0.so b/project/jni/openssl/lib-arm64-v8a/libssl.so.sdl.0.so deleted file mode 100755 index 644e003d5..000000000 Binary files a/project/jni/openssl/lib-arm64-v8a/libssl.so.sdl.0.so and /dev/null differ diff --git a/project/jni/openssl/setCrossEnvironment-arm64-v8a.sh b/project/jni/openssl/setCrossEnvironment-arm64-v8a.sh index 0d2a76716..c4781dd4b 100755 --- a/project/jni/openssl/setCrossEnvironment-arm64-v8a.sh +++ b/project/jni/openssl/setCrossEnvironment-arm64-v8a.sh @@ -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` diff --git a/project/jni/openssl/setCrossEnvironment-armeabi-v7a.sh b/project/jni/openssl/setCrossEnvironment-armeabi-v7a.sh index e5b3c84b3..28fb0d818 100755 --- a/project/jni/openssl/setCrossEnvironment-armeabi-v7a.sh +++ b/project/jni/openssl/setCrossEnvironment-armeabi-v7a.sh @@ -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` diff --git a/project/jni/openssl/setCrossEnvironment-armeabi.sh b/project/jni/openssl/setCrossEnvironment-armeabi.sh index ce79ba52b..3064289c5 100755 --- a/project/jni/openssl/setCrossEnvironment-armeabi.sh +++ b/project/jni/openssl/setCrossEnvironment-armeabi.sh @@ -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` diff --git a/project/jni/openssl/setCrossEnvironment-mips.sh b/project/jni/openssl/setCrossEnvironment-mips.sh index 07167a7bb..cf265a446 100755 --- a/project/jni/openssl/setCrossEnvironment-mips.sh +++ b/project/jni/openssl/setCrossEnvironment-mips.sh @@ -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` diff --git a/project/jni/openssl/setCrossEnvironment-x86.sh b/project/jni/openssl/setCrossEnvironment-x86.sh index 62763d202..c14d3ef91 100755 --- a/project/jni/openssl/setCrossEnvironment-x86.sh +++ b/project/jni/openssl/setCrossEnvironment-x86.sh @@ -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`