diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh
index 1d3cd7407..d2deb7cd2 100755
--- a/project/jni/application/openttd/AndroidBuild.sh
+++ b/project/jni/application/openttd/AndroidBuild.sh
@@ -6,7 +6,6 @@ LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 VER=build
 
 export CMAKE_BUILD_PARALLEL_LEVEL=$BUILD_NUM_CPUS
-echo CMAKE_BUILD_PARALLEL_LEVEL=$BUILD_NUM_CPUS
 
 [ -d openttd-$VER-$1 ] || mkdir -p openttd-$VER-$1/bin/baseset
 
@@ -102,6 +101,8 @@ export ARCH=$1
 		-DHOST_BINARY_DIR=$LOCAL_PATH/build-tools \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_PREFIX_PATH=$LOCAL_PATH/../../iconv/src/$ARCH/ \
+		"$([ -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
 
diff --git a/project/jni/application/openttd/download-data.sh b/project/jni/application/openttd/download-data.sh
index 2c739fbde..35bc4c111 100755
--- a/project/jni/application/openttd/download-data.sh
+++ b/project/jni/application/openttd/download-data.sh
@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 
 set -e
-set -x
+
+# 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
@@ -13,10 +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
-mkdir -p ./data-plat-indp
-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
@@ -27,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 ./