From 3480bf7346bf6d87f1a5ad8d34c6d8bd1bbd55be Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 24 Sep 2016 20:22:10 +0200
Subject: [PATCH] Switch from cmake to ndk-build

We switch from cmake to ndk-build to make it easier for builders
in not requiring an additional tool installed. The JNI build is
so simple so we don't really need much of a build tool anyway.
---
 app/CMakeLists.txt          |  5 -----
 app/build.gradle            | 10 ++++++++--
 app/src/main/jni/Android.mk |  5 +++++
 3 files changed, 13 insertions(+), 7 deletions(-)
 delete mode 100644 app/CMakeLists.txt
 create mode 100644 app/src/main/jni/Android.mk

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
deleted file mode 100644
index 2188859e..00000000
--- a/app/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-cmake_minimum_required(VERSION 3.4.1)
-
-add_library(termux SHARED src/main/jni/termux.c)
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wall -Wextra -Os -fno-stack-protector -Wl,--gc-sections")
diff --git a/app/build.gradle b/app/build.gradle
index a40473b9..1066d0a7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,6 +16,12 @@ android {
         versionCode 42
         versionName "0.42"
 
+        externalNativeBuild {
+            ndkBuild {
+                cFlags "-std=c11 -Wall -Wextra -Werror -Os -fno-stack-protector -Wl,--gc-sections"
+            }
+        }
+
         ndk {
             abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
         }
@@ -30,8 +36,8 @@ android {
     }
 
     externalNativeBuild {
-        cmake {
-            path "CMakeLists.txt"
+        ndkBuild {
+            path "src/main/jni/Android.mk"
         }
     }
 }
diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
new file mode 100644
index 00000000..6c6f8b22
--- /dev/null
+++ b/app/src/main/jni/Android.mk
@@ -0,0 +1,5 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE:= libtermux
+LOCAL_SRC_FILES:= termux.c
+include $(BUILD_SHARED_LIBRARY)