tor

commit 22f024693204352247025f27d498db3e76f52964
parent 1cf796d3b4246b787c30b436a901a52cf86e04bf
Author: Alexander Færøy <ahf@torproject.org>
Date:   Wed, 13 Sep 2023 18:29:54 +0200

Merge remote-tracking branch 'upstream/merge-requests/493' into ahf/android-gp-fixes-bulk

Diffstat:
M
src/app/config/config.c
 | 
9
+++++++++

1 file changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/app/config/config.c b/src/app/config/config.c
@@ -6907,6 +6907,15 @@ get_data_directory(const char *val)
   } else {
     return tor_strdup(get_windows_conf_root());
   }
+#elif defined(__ANDROID__)
+  /* Android apps can only use paths that are configured at runtime.
+   * /data/local/tmp is guaranteed to exist, but is only usable by the
+   * 'shell' and 'root' users, so this fallback is for debugging only. */
+  if (val) {
+    return tor_strdup(val);
+  } else {
+    return tor_strdup("/data/local/tmp");
+  }
 #else /* !defined(_WIN32) */
   const char *d = val;
   if (!d)