Merge remote-tracking branch 'upstream/sdl_android' into sdl_android

project/jni/application/openttd/AndroidAppSettings.cfg

@@ -273,11 +273,11 @@ NDK_TOOLCHAIN_VERSION=clang
 # android-16 = Android 4.1, the earliest supported version in NDK r18.
 # android-18 = Android 4.3, the first version supporting GLES3.
 # android-21 = Android 5.1, the first version with SO_REUSEPORT defined.
-APP_PLATFORM=21
+APP_PLATFORM=19
 
 # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
 # Available architectures: armeabi-v7a arm64-v8a x86 x86_64
-MultiABI='arm64-v8a armeabi-v7a x86 x86_64'
+MultiABI='armeabi-v7a arm64-v8a x86 x86_64'
 
 # Optional shared libraries to compile - removing some of them will save space
 # MP3 patents are expired, but libmad license is GPL, not LGPL

project/jni/application/openttd/AndroidBuild.sh

@@ -5,6 +5,9 @@ LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
 VER=build
 
+[ -z "$BUILD_NUM_CPUS" ] && $BUILD_NUM_CPUS=8
+export CMAKE_BUILD_PARALLEL_LEVEL=$BUILD_NUM_CPUS
+
 [ -d openttd-$VER-$1 ] || mkdir -p openttd-$VER-$1/bin/baseset
 
 export ARCH=$1
@@ -85,6 +88,8 @@ export ARCH=$1
 	else
 		NINJA_PATH=$(which ninja)
 	fi
+	NINJA_ARGS=
+	[ -n "$NINJA_PATH" ] && NINJA_ARGS="-DCMAKE_MAKE_PROGRAM=$NINJA_PATH -GNinja"
 
 	${CMAKE_BIN_LOC}cmake \
 		-DCMAKE_MODULE_PATH=$LOCAL_PATH/openttd-$VER-$1/cmake \
@@ -96,8 +101,9 @@ export ARCH=$1
 		-DHOST_BINARY_DIR=$LOCAL_PATH/build-tools \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_PREFIX_PATH=$LOCAL_PATH/../../iconv/src/$ARCH/ \
-        -DCMAKE_MAKE_PROGRAM=$NINJA_PATH \
-        -GNinja \
+		"$([ -n "$CMAKE_C_FLAGS_RELWITHDEBINFO" ] && echo -DCMAKE_C_FLAGS_RELWITHDEBINFO="$CMAKE_C_FLAGS_RELWITHDEBINFO")" \
+		"$([ -n "$CMAKE_CXX_FLAGS_RELWITHDEBINFO" ] && echo -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$CMAKE_CXX_FLAGS_RELWITHDEBINFO")" \
+		$NINJA_ARGS \
 		-B ./openttd-$VER-$1 -S ./src
 
 } || exit 1

project/jni/application/openttd/download-data.sh

@@ -2,6 +2,14 @@
 
 set -e
 
+# Base game data
+mkdir -p ./data-plat-indp
+pushd ./data-plat-indp
+cmp .ottdrev ../src/.ottdrev && {
+	echo "Version did not change - no need to download data files"
+	exit
+}
+
 GFX_VERSION=7.1
 SFX_VERSION=1.0.3
 MSX_VERSION=0.4.2
@@ -12,9 +20,6 @@ SFX_VERSION=$(curl --fail https://cdn.openttd.org/opensfx-releases/latest.yaml |
 MSX_VERSION=$(curl --fail https://cdn.openttd.org/openmsx-releases/latest.yaml | grep -Po "version: \K[0-9.]+")
 
 
-# Base game data
-pushd ./data-plat-indp
-
 if ! [ -e "./opengfx-${GFX_VERSION}.tar" ]; then
 	curl --fail https://cdn.openttd.org/opengfx-releases/${GFX_VERSION}/opengfx-${GFX_VERSION}-all.zip | jar xv
 fi
@@ -25,3 +30,5 @@ if ! [ -d "./openmsx-${MSX_VERSION}/" ]; then
 	curl --fail https://cdn.openttd.org/openmsx-releases/${MSX_VERSION}/openmsx-${MSX_VERSION}-all.zip | jar xv
 	tar xvf ./openmsx-${MSX_VERSION}.tar && rm ./openmsx-${MSX_VERSION}.tar
 fi
+
+cp -f ../src/.ottdrev ./

project/jni/application/openttd/pack-data.sh

@@ -7,33 +7,41 @@ ARCH=$1
 ANDROID_DATA_FULLPATH=$(realpath ./AndroidData/)
 
 # Base game data
-pushd ./data
-rm -f ${ANDROID_DATA_FULLPATH}/openttd-data-*.zip.xz ${ANDROID_DATA_FULLPATH}/openttd-data-*.zip
+[ -e ${ANDROID_DATA_FULLPATH}/openttd-data-$VER.zip.xz ] && [ -n "$NO_REBUILD_DATA" ] || {
+	pushd ./data
+	rm -f ${ANDROID_DATA_FULLPATH}/openttd-data-*.zip.xz ${ANDROID_DATA_FULLPATH}/openttd-data-*.zip
 
-pushd ./baseset
-	cp ../../data-plat-indp/opengfx*.tar .
-	cp ../../data-plat-indp/opensfx*.tar .
-	cp -r ../../data-plat-indp/openmsx*/ .
-popd
+	pushd ./baseset
+		cp ../../data-plat-indp/opengfx*.tar .
+		cp ../../data-plat-indp/opensfx*.tar .
+		cp -r ../../data-plat-indp/openmsx*/ .
+	popd
 
-zip -0 -r ${ANDROID_DATA_FULLPATH}/openttd-data-$VER.zip ./ && xz -8 ${ANDROID_DATA_FULLPATH}/openttd-data-$VER.zip
-popd
+	zip -0 -r ${ANDROID_DATA_FULLPATH}/openttd-data-$VER.zip ./ && xz -8 ${ANDROID_DATA_FULLPATH}/openttd-data-$VER.zip
+	popd
+}
 
 # Timidity
-pushd ../../timidity/samples/
-rm -f ${ANDROID_DATA_FULLPATH}/timidity.zip.xz ${ANDROID_DATA_FULLPATH}/timidity.zip
-cp ./timidity.zip ${ANDROID_DATA_FULLPATH}/timidity.zip && xz -8 ${ANDROID_DATA_FULLPATH}/timidity.zip
-popd
+[ -e ${ANDROID_DATA_FULLPATH}/timidity.zip.xz ] && [ -n "$NO_REBUILD_DATA" ] || {
+	pushd ../../timidity/samples/
+	rm -f ${ANDROID_DATA_FULLPATH}/timidity.zip.xz ${ANDROID_DATA_FULLPATH}/timidity.zip
+	cp ./timidity.zip ${ANDROID_DATA_FULLPATH}/timidity.zip && xz -8 ${ANDROID_DATA_FULLPATH}/timidity.zip
+	popd
+}
 
 # ICU
 # TODO handle versioning. Use Makefile var
-pushd ../../iconv/src/$ARCH/
-rm -f ${ANDROID_DATA_FULLPATH}/icudt62l.zip.xz ${ANDROID_DATA_FULLPATH}/icudt62l.zip
-zip -0 ${ANDROID_DATA_FULLPATH}/icudt62l.zip share/icu/62.1/icudt62l.dat && xz -8 ${ANDROID_DATA_FULLPATH}/icudt62l.zip
-popd
+[ -e ${ANDROID_DATA_FULLPATH}/icudt62l.zip.xz ] && [ -n "$NO_REBUILD_DATA" ] || {
+	pushd ../../icuuc
+	rm -f ${ANDROID_DATA_FULLPATH}/icudt62l.zip.xz ${ANDROID_DATA_FULLPATH}/icudt62l.zip
+	zip -0 ${ANDROID_DATA_FULLPATH}/icudt62l.zip share/icu/62.1/icudt62l.dat && xz -8 ${ANDROID_DATA_FULLPATH}/icudt62l.zip
+	popd
+}
 
 # Fonts
-pushd ../../freetype/
-rm -f ${ANDROID_DATA_FULLPATH}/openttd-fonts.zip.xz ${ANDROID_DATA_FULLPATH}/openttd-fonts.zip
-zip -0 -r ${ANDROID_DATA_FULLPATH}/openttd-fonts.zip ./fonts/ && xz -8 ${ANDROID_DATA_FULLPATH}/openttd-fonts.zip
-popd
+[ -e ${ANDROID_DATA_FULLPATH}/openttd-fonts.zip.xz ] && [ -n "$NO_REBUILD_DATA" ] || {
+	pushd ../../freetype/
+	rm -f ${ANDROID_DATA_FULLPATH}/openttd-fonts.zip.xz ${ANDROID_DATA_FULLPATH}/openttd-fonts.zip
+	zip -0 -r ${ANDROID_DATA_FULLPATH}/openttd-fonts.zip ./fonts/ && xz -8 ${ANDROID_DATA_FULLPATH}/openttd-fonts.zip
+	popd
+}

project/jni/application/setEnvironment-armeabi-v7a.sh

@@ -25,7 +25,7 @@ fi
 ARCH=armeabi-v7a
 GCCPREFIX=armv7a-linux-androideabi
 BINUTILSPREFIX=arm-linux-androideabi
-APILEVEL=21
+APILEVEL=19
 
 APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@' | sed 's@\b\(application\|sdl_main\|sdl_native_helpers\|c++_shared\)\b@@g'`
 

project/jni/application/setEnvironment-x86.sh

@@ -24,7 +24,7 @@ else
 fi
 ARCH=x86
 GCCPREFIX=i686-linux-android
-APILEVEL=21
+APILEVEL=19
 
 APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@' | sed 's@\b\(application\|sdl_main\|sdl_native_helpers\|c++_shared\)\b@@g'`
 

project/jni/application/setEnvironment-x86_64.sh

@@ -6,7 +6,7 @@ IFS='
 NDK=${ANDROID_NDK_HOME:-$(dirname $(which ndk-build))}
 
 if uname -s | grep -i "linux" > /dev/null ; then
-	MYARCH=linux-$(arch)
+	MYARCH=linux-$(uname -m)
 	NDK=`readlink -f $NDK`
 elif uname -s | grep -i "darwin" > /dev/null ; then
 	MYARCH=darwin-x86_64