Commit dd08fc13 authored by Max Lv's avatar Max Lv

Merge branch 'master' of github.com:shadowsocks/shadowsocks-android

Conflicts:
	jni/shadowsocks/local.c
parents 838167b0 a857a394
APP_PLATFORM = android-9 APP_PLATFORM = android-9
NDK_TOOLCHAIN_VERSION = clang3.1
...@@ -603,6 +603,11 @@ int main (int argc, char **argv) ...@@ -603,6 +603,11 @@ int main (int argc, char **argv)
close(STDIN_FILENO); close(STDIN_FILENO);
close(STDOUT_FILENO); close(STDOUT_FILENO);
close(STDERR_FILENO); close(STDERR_FILENO);
} else {
pid_t pid = getpid();
FILE *file = fopen("/data/data/com.github.shadowsocks/shadowsocks.pid", "w");
fprintf(file, "%d", pid);
fclose(file);
} }
_server = strdup(server); _server = strdup(server);
......
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