From 5bc7200d218a4f1df8a48b1274040bd6b2a213d1 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Sat, 9 Dec 2017 23:02:45 +0800
Subject: [PATCH] Fix the exception when addAllowedApplication

---
 core/build.gradle                                          | 7 +++++--
 core/src/overture/make.bash                                | 2 +-
 .../src/main/java/com/github/shadowsocks/bg/VpnService.kt  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 6cf206f4..fc7b82df 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -43,9 +43,12 @@ task goClean(type: Exec) {
     args "-c", "src/overture/clean.bash"
 }
 
+import org.apache.tools.ant.taskdefs.condition.Os
+
 tasks.whenTaskAdded { task ->
-  if (task.name == 'generateJsonModelDebug' ||
-          task.name == 'generateJsonModelRelease') {
+  if ((task.name == 'generateJsonModelDebug' ||
+          task.name == 'generateJsonModelRelease') &&
+          !Os.isFamily(Os.FAMILY_WINDOWS)) {
       task.dependsOn(goBuild)
     }
 }
diff --git a/core/src/overture/make.bash b/core/src/overture/make.bash
index 04edca58..f90bcc04 100755
--- a/core/src/overture/make.bash
+++ b/core/src/overture/make.bash
@@ -44,7 +44,7 @@ if [ ! -f "$ANDROID_X86_CC" ]; then
         --api $MIN_API --install-dir $ANDROID_X86_TOOLCHAIN
 fi
 
-if [ ! -d "$DIR/go/bin" ]; then
+if [ ! -f "$DIR/go/bin/go" ]; then
     echo "Build the custom go"
 
     pushd $DIR/go/src
diff --git a/mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt b/mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt
index ed66100f..c24fcac0 100644
--- a/mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/bg/VpnService.kt
@@ -152,7 +152,7 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
                             Log.e(tag, "Invalid package name", ex)
                         }
                     }
-            builder.addAllowedApplication(me)
+            if (!profile.bypass) builder.addAllowedApplication(me)
         }
 
         when (profile.route) {