Fix the exception when addAllowedApplication

This commit is contained in:
Max Lv
2017-12-09 23:02:45 +08:00
parent f5a8513b00
commit 5bc7200d21
3 changed files with 7 additions and 4 deletions
+5 -2
View File
@@ -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)
}
}
+1 -1
View File
@@ -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
@@ -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) {