diff --git a/build.sh b/build.sh index 51776039a..b425d1af1 100755 --- a/build.sh +++ b/build.sh @@ -175,9 +175,9 @@ cd project && env PATH=$NDKBUILDPATH BUILD_NUM_CPUS=$NCPU nice -n19 ndk-build -j ./AndroidPostBuild.sh `pwd`/../../../app/build/outputs/apk/app-release-unsigned.apk || exit 1 ; \ cd ../../.. ; \ } || exit 1 ; \ - jarsigner -verbose -keystore ~/.android/debug.keystore -storepass android -sigalg MD5withRSA -digestalg SHA1 app/build/outputs/apk/app-release-unsigned.apk androiddebugkey || exit 1 ; \ rm -f app/build/outputs/apk/app-release.apk ; \ zipalign 4 app/build/outputs/apk/app-release-unsigned.apk app/build/outputs/apk/app-release.apk || exit 1 ; \ + apksigner sign --ks ~/.android/debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android app/build/outputs/apk/app-release.apk || exit 1 ; \ else \ ./gradlew assembleDebug && \ mv -f app/build/outputs/apk/app-debug.apk app/build/outputs/apk/app-release.apk \ diff --git a/project/jni/application/openlierox/AndroidAppSettings.cfg b/project/jni/application/openlierox/AndroidAppSettings.cfg index 003978a7c..c0a0384a6 100644 --- a/project/jni/application/openlierox/AndroidAppSettings.cfg +++ b/project/jni/application/openlierox/AndroidAppSettings.cfg @@ -24,7 +24,7 @@ AppDataDownloadUrl="!!Game data|data.zip.xz" ResetSdlConfigForThisVersion=y # Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag ." #"libsdl-DownloadFinished-0.flag" +DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag" # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ @@ -264,8 +264,7 @@ APP_PLATFORM=android-21 # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a -MultiABI='armeabi-v7a' # arm64-v8a x86 -#MultiABI='x86 x86_64' +MultiABI='armeabi-v7a arm64-v8a x86 x86_64' # arm64-v8a x86 x86_64 # 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 @@ -276,13 +275,13 @@ CompiledLibraries="sdl_image sdl_mixer xml2 curl gd jpeg vorbis ogg lzma" CustomBuildScript=n # Aditional CFLAGS for application -AppCflags='-flto=thin -O3 -ffast-math -Werror=format -DDISABLE_JOYSTICK -DHAVE_LINENOISE -DNBREAKPAD -DHAVE_EXECINFO=0 -DSINGLETHREADED=1' +AppCflags='-flto=thin -O3 -ffast-math -Werror=format -DDISABLE_JOYSTICK -DHAVE_LINENOISE -DNBREAKPAD -DHAVE_EXECINFO=0' # Aditional C++-specific compiler flags for application, added after AppCflags -AppCppflags='-flto=thin -O3 -ffast-math -Werror=format -std=c++11 -frtti -fexceptions -DDISABLE_JOYSTICK -DHAVE_LINENOISE -DNBREAKPAD -DHAVE_EXECINFO=0 -DSINGLETHREADED=1' +AppCppflags='-flto=thin -O3 -ffast-math -Werror=format -std=c++11 -frtti -fexceptions -DDISABLE_JOYSTICK -DHAVE_LINENOISE -DNBREAKPAD -DHAVE_EXECINFO=0' # Additional LDFLAGS for application -AppLdflags='-flto=thin -flto-jobs=8 -O1' +AppLdflags='-flto=thin -flto-jobs=8 -O3' # If application has headers with the same name as system headers, this option tries to fix compiler flags to make it compilable AppOverlapsSystemHeaders=n diff --git a/project/jni/application/openlierox/src b/project/jni/application/openlierox/src index 0a37a18ad..e25e82b28 160000 --- a/project/jni/application/openlierox/src +++ b/project/jni/application/openlierox/src @@ -1 +1 @@ -Subproject commit 0a37a18ada7c1cec475116bb8472cd99f0a734ce +Subproject commit e25e82b2891d482c126f42ef7dcbff37866f2af9 diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index c029120a7..bbeaad03e 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit c029120a7b7eb692fa38855940c4d7fd90a7636e +Subproject commit bbeaad03e4b470d0f114b252374c82942a1f1d07