From 33adb9b1dc4f7d464ff3d3b3fa058d1790d6bee6 Mon Sep 17 00:00:00 2001
From: MoroccanMalinois <MoroccanMalinois@protonmail.com>
Date: Tue, 21 Aug 2018 23:25:14 +0000
Subject: [PATCH] Build: Fix target release-static-android

---
 CMakeLists.txt | 1 +
 Makefile       | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f47d7d04..4cae348ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -837,6 +837,7 @@ endif()
 
 if(ANDROID)
   set(ATOMIC libatomic.a)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=user-defined-warnings")
 endif()
 if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND ARCH_WIDTH EQUAL "32" AND NOT IOS AND NOT FREEBSD)
   find_library(ATOMIC atomic)
diff --git a/Makefile b/Makefile
index f3abcb795..b725d1802 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,8 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+ANDROID_STANDALONE_TOOLCHAIN_PATH ?= /usr/local/toolchain
+
 all: release-all
 
 cmake-debug:
@@ -83,8 +85,9 @@ release-static-linux-armv7:
 	cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release -D BUILD_TAG="linux-armv7" ../.. && $(MAKE)
 
 release-static-android:
-	mkdir -p build/release
-	cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D INSTALL_VENDORED_LIBUNBOUND=ON -D BUILD_TAG="android" ../.. && $(MAKE)
+	mkdir -p build/release/translations
+	cd build/release/translations && cmake ../../../translations && $(MAKE)
+	cd build/release && CC=arm-linux-androideabi-clang CXX=arm-linux-androideabi-clang++ cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D INSTALL_VENDORED_LIBUNBOUND=ON -D BUILD_TAG="android" -D CMAKE_SYSTEM_NAME="Android" -D CMAKE_ANDROID_STANDALONE_TOOLCHAIN="${ANDROID_STANDALONE_TOOLCHAIN_PATH}" -D CMAKE_ANDROID_ARM_MODE=ON -D CMAKE_ANDROID_ARCH_ABI="armeabi-v7a" ../.. && $(MAKE)
 
 release-static-linux-armv8:
 	mkdir -p build/release