SuperTux: updated build files

project/jni/application/supertux/AndroidAppSettings.cfg

@@ -286,7 +286,7 @@ APP_PLATFORM=
 # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
 # Available architectures: armeabi-v7a arm64-v8a x86 x86_64
 MultiABI='armeabi-v7a arm64-v8a x86 x86_64'
-MultiABI='arm64-v8a'
+#MultiABI='arm64-v8a'
 
 # Optional shared libraries to compile - removing some of them will save space
 # MP3 patents are expired, but libmad license is GPL, not LGPL
@@ -315,7 +315,7 @@ AppSubdirsBuild='. supertux/src/* supertux/external/findlocale supertux/external
 AppBuildExclude='supertux/external/findlocale/example.c supertux/src/video/sdl supertux/external/SDL_SavePNG/main.c'
 
 # Application command line parameters, including app name as 0-th param
-AppCmdline='./supertux2 --verbose --developer --show-fps'
+AppCmdline='./supertux2 --verbose --developer'
 
 # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens
 # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge

project/jni/application/supertux/create-apk-with-data.sh

@@ -11,9 +11,13 @@ OUT=`pwd`/../../../../SuperTux-with-data.apk
 DATAZIP=`pwd`/../../../../SuperTux-data.zip
 rm -f $OUT $OUT-aligned
 cd supertux/data || exit 1
-[ -e $DATAZIP ] || zip -r -9 $DATAZIP * || exit 1
 cp -f ../../../../../../project/app/build/outputs/apk/release/app-release.apk $OUT || exit 1
-zipmerge $OUT $DATAZIP
+if zipmerge -h >/dev/null; then
+	[ -e $DATAZIP ] || zip -r -9 $DATAZIP * || exit 1
+	zipmerge $OUT $DATAZIP || exit 1
+else
+	zip -r -9 $OUT * || exit 1
+fi
 zipalign -p 4 $OUT $OUT-aligned || exit 1
 mv $OUT-aligned $OUT
 apksigner sign --ks $ANDROID_KEYSTORE_FILE --ks-key-alias $ANDROID_KEYSTORE_ALIAS $PASS $OUT || exit 1