tools: build required tools with apk

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

2 files changed, 9 insertions, 20 deletions

diff --git a/app/src/main/java/com/wireguard/android/backends/RootShell.java b/app/src/main/java/com/wireguard/android/backends/RootShell.java
index 9fd5020d..31b10f98 100644
--- a/app/src/main/java/com/wireguard/android/backends/RootShell.java
+++ b/app/src/main/java/com/wireguard/android/backends/RootShell.java
@@ -22,7 +22,7 @@ class RootShell {
      * Setup commands that are run at the beginning of each root shell. The trap command ensures
      * access to the return value of the last command, since su itself always exits with 0.
      */
-    private static final String SETUP_TEMPLATE = "export TMPDIR=%s\ntrap 'echo $?' EXIT\n";
+    private static final String SETUP_TEMPLATE = "export PATH=\"%s/bin:$PATH\"; export TMPDIR=\"%s/temp\"; trap 'echo $?' EXIT; mkdir -p \"%s/bin\" \"%s/temp\"; ln -fs \"%s/libwg.so\" \"%s/bin/wg\" || exit 99; ln -fs \"%s/libwg-quick.so\" \"%s/bin/wg-quick\" || exit 99;";
     private static final String TAG = "RootShell";
     private static final Pattern ERRNO_EXTRACTOR = Pattern.compile("error=(\\d+)");
 
@@ -35,7 +35,8 @@ class RootShell {
 
     RootShell(final Context context, final String shell) {
         final String tmpdir = context.getCacheDir().getPath();
-        setupCommands = String.format(SETUP_TEMPLATE, tmpdir).getBytes(StandardCharsets.UTF_8);
+        final String fakelibdir = context.getApplicationInfo().nativeLibraryDir;
+        setupCommands = String.format(SETUP_TEMPLATE, tmpdir, tmpdir, tmpdir, tmpdir, fakelibdir, tmpdir, fakelibdir, tmpdir).getBytes(StandardCharsets.UTF_8);
         this.shell = shell;
     }
 
diff --git a/app/src/main/java/com/wireguard/android/backends/VpnService.java b/app/src/main/java/com/wireguard/android/backends/VpnService.java
index 3a8f6597..5e254d2e 100644
--- a/app/src/main/java/com/wireguard/android/backends/VpnService.java
+++ b/app/src/main/java/com/wireguard/android/backends/VpnService.java
@@ -261,17 +261,6 @@ public class VpnService extends Service
 
     private class ConfigEnabler extends AsyncTask<Void, Void, Integer> {
         private final Config config;
-        private final String[] paths = {
-                "/system/xbin",
-                "/system/sbin",
-                "/system/bin",
-                "/sbin",
-                "/bin",
-                "/xbin",
-                "/usr/sbin",
-                "/usr/bin",
-                "/usr/xbin",
-        };
 
         private ConfigEnabler(final Config config) {
             this.config = config;
@@ -281,19 +270,21 @@ public class VpnService extends Service
         protected Integer doInBackground(final Void... voids) {
             if (!new File("/sys/module/wireguard").exists())
                 return -0xfff0001;
-            if (!existsInPath("wg") || !existsInPath("wg-quick"))
-                return -0xfff0002;
             if (!existsInPath("su"))
-                return -0xfff0003;
+                return -0xfff0002;
             Log.i(TAG, "Running wg-quick up for " + config.getName());
             final File configFile = new File(getFilesDir(), config.getName() + ".conf");
             final int ret = rootShell.run(null, "wg-quick up '" + configFile.getPath() + "'");
             if (ret == 13 /* EPERM */)
-                return -0xfff0003;
+                return -0xfff0002;
             return ret;
         }
 
         private boolean existsInPath(final String file) {
+            final String pathEnv = System.getenv("PATH");
+            if (pathEnv == null)
+                return false;
+            final String[] paths = pathEnv.split(":");
             for (final String path : paths)
                 if (new File(path, file).exists())
                     return true;
@@ -307,9 +298,6 @@ public class VpnService extends Service
                 if (ret == -0xfff0001) {
                     startActivity(new Intent(getApplicationContext(), NotSupportedActivity.class));
                 } else if (ret == -0xfff0002) {
-                    Toast.makeText(getApplicationContext(), getString(R.string.error_missing),
-                            Toast.LENGTH_LONG).show();
-                } else if (ret == -0xfff0003) {
                     Toast.makeText(getApplicationContext(), getString(R.string.error_su),
                             Toast.LENGTH_LONG).show();
                 } else {