Commit 5bc7200d authored by Max Lv's avatar Max Lv

Fix the exception when addAllowedApplication

parent f5a8513b
...@@ -43,9 +43,12 @@ task goClean(type: Exec) { ...@@ -43,9 +43,12 @@ task goClean(type: Exec) {
args "-c", "src/overture/clean.bash" args "-c", "src/overture/clean.bash"
} }
import org.apache.tools.ant.taskdefs.condition.Os
tasks.whenTaskAdded { task -> tasks.whenTaskAdded { task ->
if (task.name == 'generateJsonModelDebug' || if ((task.name == 'generateJsonModelDebug' ||
task.name == 'generateJsonModelRelease') { task.name == 'generateJsonModelRelease') &&
!Os.isFamily(Os.FAMILY_WINDOWS)) {
task.dependsOn(goBuild) task.dependsOn(goBuild)
} }
} }
......
...@@ -44,7 +44,7 @@ if [ ! -f "$ANDROID_X86_CC" ]; then ...@@ -44,7 +44,7 @@ if [ ! -f "$ANDROID_X86_CC" ]; then
--api $MIN_API --install-dir $ANDROID_X86_TOOLCHAIN --api $MIN_API --install-dir $ANDROID_X86_TOOLCHAIN
fi fi
if [ ! -d "$DIR/go/bin" ]; then if [ ! -f "$DIR/go/bin/go" ]; then
echo "Build the custom go" echo "Build the custom go"
pushd $DIR/go/src pushd $DIR/go/src
......
...@@ -152,7 +152,7 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface { ...@@ -152,7 +152,7 @@ class VpnService : BaseVpnService(), LocalDnsService.Interface {
Log.e(tag, "Invalid package name", ex) Log.e(tag, "Invalid package name", ex)
} }
} }
builder.addAllowedApplication(me) if (!profile.bypass) builder.addAllowedApplication(me)
} }
when (profile.route) { when (profile.route) {
......
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