diff --git a/build.sh b/build.sh index 7e230e81d..b0bb43977 100755 --- a/build.sh +++ b/build.sh @@ -187,14 +187,14 @@ cd project && env PATH=$NDKBUILDPATH BUILD_NUM_CPUS=$NCPU nice -n19 ndk-build -j ./AndroidPostBuild.sh `pwd`/../../../bin/MainActivity-release-unsigned.apk || exit 1 ; \ cd ../../.. ; \ } || exit 1 ; \ - jarsigner -tsa http://timestamp.digicert.com -verbose -keystore ~/.android/debug.keystore -storepass android -sigalg MD5withRSA -digestalg SHA1 bin/MainActivity-release-unsigned.apk androiddebugkey || exit 1 ; \ + jarsigner -verbose -keystore ~/.android/debug.keystore -storepass android -sigalg MD5withRSA -digestalg SHA1 bin/MainActivity-release-unsigned.apk androiddebugkey || exit 1 ; \ rm -f bin/MainActivity-debug.apk ; \ zipalign 4 bin/MainActivity-release-unsigned.apk bin/MainActivity-debug.apk || exit 1 ; \ else \ $quick_rebuild && { \ ln -s -f libs lib ; \ zip -u -r bin/MainActivity-debug-unaligned.apk lib assets || exit 1 ; \ - jarsigner -tsa http://timestamp.digicert.com -verbose -keystore ~/.android/debug.keystore -storepass android -sigalg MD5withRSA -digestalg SHA1 bin/MainActivity-debug-unaligned.apk androiddebugkey || exit 1 ; \ + jarsigner -verbose -keystore ~/.android/debug.keystore -storepass android -sigalg MD5withRSA -digestalg SHA1 bin/MainActivity-debug-unaligned.apk androiddebugkey || exit 1 ; \ rm -f bin/MainActivity-debug.apk ; \ zipalign 4 bin/MainActivity-debug-unaligned.apk bin/MainActivity-debug.apk || exit 1 ; \ } || ant debug || exit 1 ; \ diff --git a/changeAppSettings.sh b/changeAppSettings.sh index bc4441acf..2b4660fd8 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -373,7 +373,7 @@ echo "# GCC version, 4.6 (default) or 4.8, CLANG is not supported yet" >> Androi echo NDK_TOOLCHAIN_VERSION=$NDK_TOOLCHAIN_VERSION >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg echo "# Specify architectures to compile, 'all' or 'y' to compile for all architectures." >> AndroidAppSettings.cfg -echo "# Available architectures: armeabi armeabi-v7a armeabi-v7a-hard x86 mips" >> AndroidAppSettings.cfg +echo "# Available architectures: armeabi armeabi-v7a x86 mips" >> AndroidAppSettings.cfg echo MultiABI=\'$MultiABI\' >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg echo "# Optional shared libraries to compile - removing some of them will save space" >> AndroidAppSettings.cfg diff --git a/project/jni/Application.mk b/project/jni/Application.mk index ea9e2e0ee..acf40500f 100644 --- a/project/jni/Application.mk +++ b/project/jni/Application.mk @@ -5,4 +5,4 @@ include jni/Settings.mk APP_STL := gnustl_static APP_CFLAGS := -O3 -DNDEBUG -g # arm-linux-androideabi-4.4.3 crashes in -O0 mode on SDL sources APP_PLATFORM := android-14 # Android 4.0, it should be backward compatible to previous versions -APP_PIE := false # This feature makes executables incompatible to Android API 15 or lower +APP_PIE := true # This feature makes executables incompatible to Android API 15 or lower, but executables without PIE will not run on Android 5.0 and newer diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg index f386c57e0..3241236f0 100644 --- a/project/jni/application/ballfield/AndroidAppSettings.cfg +++ b/project/jni/application/ballfield/AndroidAppSettings.cfg @@ -247,7 +247,7 @@ CustomBuildScript=n AppCflags='-O2 -finline-functions' # Additional LDFLAGS for application -AppLdflags='-fuse-ld=bfd' +AppLdflags='' # If application has headers with the same name as system headers, this option tries to fix compiler flags to make it compilable AppOverlapsSystemHeaders= diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 72483aa8c..c5210b0c4 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 72483aa8c1f681e1528f1918a0afcd1c7b60602e +Subproject commit c5210b0c4209d6c9b6a49350057877448882a776 diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index acd190733..35b97d2c9 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit acd190733ec13c64ee2f46b36c4a66b5b5272e32 +Subproject commit 35b97d2c9eb9306dc73d234aa25e70b68c4e74ab diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 3c58263af..67598fad8 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 3c58263af7f8831df6e81d5a3bb0a2e487bcc807 +Subproject commit 67598fad8d277f4f5f3c68507af93860bbe52e4f diff --git a/project/jni/application/supertux/supertux b/project/jni/application/supertux/supertux index 0f0c1a2c9..b417ddc7e 160000 --- a/project/jni/application/supertux/supertux +++ b/project/jni/application/supertux/supertux @@ -1 +1 @@ -Subproject commit 0f0c1a2c954f839eb516dfe10896669b15f6d0b6 +Subproject commit b417ddc7efbab9fd634265ba4fdea36b9236b7cd diff --git a/project/jni/application/vice/vice b/project/jni/application/vice/vice index 0b817c357..18d3739b3 160000 --- a/project/jni/application/vice/vice +++ b/project/jni/application/vice/vice @@ -1 +1 @@ -Subproject commit 0b817c357e5a25d37df98d97930469bd485ebb4c +Subproject commit 18d3739b3368581ade39fd69767ab5fa321a4ccc diff --git a/project/jni/boost/src b/project/jni/boost/src index 5824acb45..bc9ea9d30 160000 --- a/project/jni/boost/src +++ b/project/jni/boost/src @@ -1 +1 @@ -Subproject commit 5824acb451e671205afeb188576be1dd9a2674bd +Subproject commit bc9ea9d3032eb1e2b095484e2052aa2bc2e91767 diff --git a/project/jni/shmem b/project/jni/shmem index c2a28f528..f6b49516c 160000 --- a/project/jni/shmem +++ b/project/jni/shmem @@ -1 +1 @@ -Subproject commit c2a28f528d0b1b2528dda125e8fe8018609e7e9a +Subproject commit f6b49516cf4b13f455a19ec989626be5472830c5 diff --git a/sign.sh b/sign.sh index 0e1d3a903..c7e4d258e 100755 --- a/sign.sh +++ b/sign.sh @@ -15,7 +15,7 @@ zip -d Signed.apk "META-INF/*" # Sign with the new certificate echo Using keystore $ANDROID_KEYSTORE_FILE and alias $ANDROID_KEYSTORE_ALIAS stty -echo -jarsigner -verbose -keystore $ANDROID_KEYSTORE_FILE -sigalg MD5withRSA -digestalg SHA1 Signed.apk $ANDROID_KEYSTORE_ALIAS || exit 1 +jarsigner -verbose -tsa http://timestamp.digicert.com -keystore $ANDROID_KEYSTORE_FILE -sigalg MD5withRSA -digestalg SHA1 Signed.apk $ANDROID_KEYSTORE_ALIAS || exit 1 stty echo echo rm -f MainActivity-debug.apk