From e7cc5ad0badc6cb58e7a10d8c6f4bb27660182be Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Sun, 8 Jan 2017 23:51:30 +0800
Subject: [PATCH] Use NDK build in sbt-android instead

---
 build.sbt | 2 --
 build.sh  | 6 ++----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/build.sbt b/build.sbt
index 6e3980d2..35561582 100644
--- a/build.sbt
+++ b/build.sbt
@@ -13,8 +13,6 @@ platformTarget := "android-25"
 compileOrder := CompileOrder.JavaThenScala
 javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil
 scalacOptions ++= "-target:jvm-1.7" :: "-Xexperimental" :: Nil
-ndkJavah := Seq()
-ndkBuild := Seq()
 
 proguardVersion := "5.3.2"
 proguardCache := Seq()
diff --git a/build.sh b/build.sh
index e8ab8df4..5a646eab 100755
--- a/build.sh
+++ b/build.sh
@@ -4,12 +4,10 @@ function try () {
 "$@" || exit -1
 }
 
-# Build native binaries
 pushd src/main
-try $ANDROID_NDK_HOME/ndk-build -j8
 # Clean up old binaries (no longer used)
-rm -rf assets/armeabi-v7a
-rm -rf assets/x86
+rm -rf assets/armeabi-v7a assets/x86 libs/armeabi-v7a libs/x86
+mkdir -p libs/armeabi-v7a libs/x86
 popd
 
 # Build kcptun