aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-07-24 13:52:18 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-07-24 17:57:56 +0200
commitf815e970464d733b39746384c8f3a96dd5f35d58 (patch)
tree85d7bf543f62253b0e01d3455966a7221a09e186
parentMake placeholder pretty (diff)
downloadwireguard-android-f815e970464d733b39746384c8f3a96dd5f35d58.tar.xz
wireguard-android-f815e970464d733b39746384c8f3a96dd5f35d58.zip
tools: pass in debug package name
-rw-r--r--app/build.gradle10
-rw-r--r--app/src/main/java/com/wireguard/android/util/RootShell.java5
-rw-r--r--app/tools/CMakeLists.txt4
m---------app/tools/wireguard0
4 files changed, 15 insertions, 4 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 950bb2f..9729af6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,10 +40,20 @@ android {
buildTypes {
release {
if (keystorePropertiesFile.exists()) signingConfig signingConfigs.release
+ externalNativeBuild {
+ cmake {
+ arguments "-DANDROID_PACKAGE_NAME=${android.defaultConfig.applicationId}"
+ }
+ }
}
debug {
applicationIdSuffix ".debug"
versionNameSuffix "-debug"
+ externalNativeBuild {
+ cmake {
+ arguments "-DANDROID_PACKAGE_NAME=${android.defaultConfig.applicationId}${applicationIdSuffix}"
+ }
+ }
}
}
externalNativeBuild {
diff --git a/app/src/main/java/com/wireguard/android/util/RootShell.java b/app/src/main/java/com/wireguard/android/util/RootShell.java
index 18e0410..9216d47 100644
--- a/app/src/main/java/com/wireguard/android/util/RootShell.java
+++ b/app/src/main/java/com/wireguard/android/util/RootShell.java
@@ -10,6 +10,7 @@ import android.content.Context;
import android.support.annotation.Nullable;
import android.util.Log;
+import com.wireguard.android.BuildConfig;
import com.wireguard.android.R;
import java.io.BufferedReader;
@@ -45,8 +46,8 @@ public class RootShell {
final File cacheDir = context.getCacheDir();
localBinaryDir = new File(cacheDir, "bin");
localTemporaryDir = new File(cacheDir, "tmp");
- preamble = String.format("export CALLING_PACKAGE=com.wireguard.android PATH=\"%s:$PATH\" TMPDIR='%s'; id -u\n",
- localBinaryDir, localTemporaryDir);
+ preamble = String.format("export CALLING_PACKAGE=%s PATH=\"%s:$PATH\" TMPDIR='%s'; id -u\n",
+ BuildConfig.APPLICATION_ID, localBinaryDir, localTemporaryDir);
}
private static boolean isExecutableInPath(final String name) {
diff --git a/app/tools/CMakeLists.txt b/app/tools/CMakeLists.txt
index 32fb65b..bc6e674 100644
--- a/app/tools/CMakeLists.txt
+++ b/app/tools/CMakeLists.txt
@@ -9,11 +9,11 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
add_executable(libwg-quick.so wireguard/src/tools/wg-quick/android.c)
-target_compile_options(libwg-quick.so PUBLIC -O3 -std=gnu11 -Wall -pedantic -Wno-missing-field-initializers)
+target_compile_options(libwg-quick.so PUBLIC -O3 -std=gnu11 -Wall -pedantic -Wno-missing-field-initializers -DWG_PACKAGE_NAME=\"${ANDROID_PACKAGE_NAME}\")
file(GLOB WG_SOURCES wireguard/src/tools/*.c libmnl/src/*.c)
add_executable(libwg.so ${WG_SOURCES})
-target_compile_options(libwg.so PUBLIC -idirafter "${CMAKE_CURRENT_SOURCE_DIR}/libmnl/include/" -I "${CMAKE_CURRENT_SOURCE_DIR}/wireguard/src/tools/" -O3 -std=gnu11 -D_GNU_SOURCE -DHAVE_VISIBILITY_HIDDEN -DRUNSTATEDIR=\"\\\"/data/data/com.wireguard.android/cache\\\"\" -Wno-pointer-arith -Wno-unused-parameter)
+target_compile_options(libwg.so PUBLIC -idirafter "${CMAKE_CURRENT_SOURCE_DIR}/libmnl/include/" -I "${CMAKE_CURRENT_SOURCE_DIR}/wireguard/src/tools/" -O3 -std=gnu11 -D_GNU_SOURCE -DHAVE_VISIBILITY_HIDDEN -DRUNSTATEDIR=\"/data/data/${ANDROID_PACKAGE_NAME}/cache\" -Wno-pointer-arith -Wno-unused-parameter)
add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libwg-go" COMMENT "Building wireguard-go" VERBATIM COMMAND make
ANDROID_ARCH_NAME=${ANDROID_ARCH_NAME}
diff --git a/app/tools/wireguard b/app/tools/wireguard
-Subproject 80b41cd845c9d240b317453af5a29580e052d6b
+Subproject be3e2a9134e1833c313e700132018de12fe2839