From a145980795a4f37ebb9857bddb7427a184bbd6dd Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Thu, 15 Oct 2020 10:35:44 +0100 Subject: Fix Android builds (#4998) Construct paths relative to the Cuberite sources with PROJECT_SOURCE_DIR, instead of wherever the first CMakeLists.txt file happened to be with CMAKE_SOURCE_DIR. In Android's case, the latter was in a folder called android/ but that's not the root of the source tree, so any file path built off that root was wrong. This caused file-specific warnings exclusions to fail to apply. --- android/compile.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'android') diff --git a/android/compile.sh b/android/compile.sh index a656247a6..4fa2c9f87 100755 --- a/android/compile.sh +++ b/android/compile.sh @@ -40,7 +40,7 @@ if [ -z "$THREADS" ]; then THREADS="4" fi -cd $BASEDIR +cd "$BASEDIR" case "$1" in @@ -93,9 +93,9 @@ case "$1" in ;; esac -mkdir -p $BUILDDIR -cd $BUILDDIR -"$CMAKE" $BASEDIR/../android -DCMAKE_TOOLCHAIN_FILE="$NDK/build/cmake/android.toolchain.cmake" \ +mkdir -p "$BUILDDIR" +cd "$BUILDDIR" +"$CMAKE" "$BASEDIR/../android" -DCMAKE_TOOLCHAIN_FILE="$NDK/build/cmake/android.toolchain.cmake" \ -DANDROID_ABI="$1" \ -DANDROID_NATIVE_API_LEVEL="$APILEVEL" \ -DCMAKE_BUILD_TYPE="$TYPE" \ -- cgit v1.2.3