From 437d8c3026d2e618df952702e9f5c510f2132120 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Tue, 17 Jan 2017 21:30:54 +0800
Subject: [PATCH] Revert "Revert "Speed up ndk-build from sbt-android""

This reverts commit bcbd8604571a9e6301b901d199507d3fd6128e3b.
---
 .travis.yml | 2 +-
 build.sbt   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 22364c17..febc039b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,4 +50,4 @@ install:
       fi
 
 script:
-    - $SBTPATH/sbt native-build android:package-debug
+    - $SBTPATH/sbt -DNPROC=$(nproc) native-build android:package-debug
diff --git a/build.sbt b/build.sbt
index bf214363..963ea618 100644
--- a/build.sbt
+++ b/build.sbt
@@ -8,6 +8,11 @@ name := "shadowsocks"
 version := "3.4.2"
 versionCode := Some(174)
 
+// Speed up ndk-build by reading nproc from environment
+// and default to 8
+val nproc = sys.props.getOrElse("NPROC", default = "8")
+ndkArgs := Seq(s"-j$nproc")
+
 platformTarget := "android-25"
 
 compileOrder := CompileOrder.JavaThenScala