From bf10b566383e67b7a26d1dc80bb3bc613168c1b5 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Thu, 2 Jan 2020 01:54:40 +0000 Subject: Fix android builds (#4432) * Terminate android build script early if any step fails * Remove deprecated android types * Use android NDK cmake support rather than cmake android NDK support as that support is better supported * Android uses GNU strerror_r? * Fix compilation * Rebase * Fix final issues * Drop submodule changes * Revert change * Parentheses * Lower api levels * Don't use GNU strerror_r for Android Co-authored-by: Mat --- android/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'android/CMakeLists.txt') diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 4f863d114..99eada26f 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -22,7 +22,7 @@ include_directories(SYSTEM ) # Disable some compiler warnings (the lazy way out) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-double-promotion") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-double-promotion -Wno-sign-conversion") # Build the rest of the server add_subdirectory(../ Cuberite) -- cgit v1.2.3