Commit e7cc5ad0 authored by Mygod's avatar Mygod

Use NDK build in sbt-android instead

parent f81b16ea
...@@ -13,8 +13,6 @@ platformTarget := "android-25" ...@@ -13,8 +13,6 @@ platformTarget := "android-25"
compileOrder := CompileOrder.JavaThenScala compileOrder := CompileOrder.JavaThenScala
javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil
scalacOptions ++= "-target:jvm-1.7" :: "-Xexperimental" :: Nil scalacOptions ++= "-target:jvm-1.7" :: "-Xexperimental" :: Nil
ndkJavah := Seq()
ndkBuild := Seq()
proguardVersion := "5.3.2" proguardVersion := "5.3.2"
proguardCache := Seq() proguardCache := Seq()
......
...@@ -4,12 +4,10 @@ function try () { ...@@ -4,12 +4,10 @@ function try () {
"$@" || exit -1 "$@" || exit -1
} }
# Build native binaries
pushd src/main pushd src/main
try $ANDROID_NDK_HOME/ndk-build -j8
# Clean up old binaries (no longer used) # Clean up old binaries (no longer used)
rm -rf assets/armeabi-v7a rm -rf assets/armeabi-v7a assets/x86 libs/armeabi-v7a libs/x86
rm -rf assets/x86 mkdir -p libs/armeabi-v7a libs/x86
popd popd
# Build kcptun # Build kcptun
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment