From e053f72db824a16c1cb59107315001473058e2bc Mon Sep 17 00:00:00 2001
From: Mat <mail@mathias.is>
Date: Sun, 10 May 2020 19:18:28 +0300
Subject: Android build cleanup (#4734)

* Android build cleanup

* Remove unnecessary workaround

* Remove more unnecessities

* Bump cmake version
---
 android/CMakeLists.txt | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'android/CMakeLists.txt')

diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index 51df60cdc..408c416d1 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -1,28 +1,15 @@
-cmake_minimum_required (VERSION 3.7)
+cmake_minimum_required (VERSION 3.12.4)
 project(Cuberite)
 
 # Set up Android parameters
-add_definitions(-DANDROID)
 set(ANDROID TRUE)
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie")
 
 # We're crosscompiling for Android
 set(NO_NATIVE_OPTIMIZATION TRUE)
 
-# SYSTEM flag to silence warnings for external headers
-include_directories(SYSTEM
-	../lib/
-	../src/
-	../lib/jsoncpp/include/
-	../lib/polarssl/include/
-	../lib/sqlitecpp/include/
-	../lib/sqlitecpp/sqlite3/
-	../lib/libevent/include/
-)
-
-# Disable some compiler warnings (the lazy way out)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-double-promotion -Wno-sign-conversion -Wno-unused-command-line-argument -s")
-
 # Build the rest of the server
 add_subdirectory(../ Cuberite)
+
+# Strip debug symbols to reduce binary size
+set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES LINK_FLAGS_RELEASE -s)
-- 
cgit v1.2.3