mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2025-02-24 06:48:05 +01:00
Merge remote-tracking branch 'upstream/merge-requests/493' into ahf/android-gp-fixes-bulk
This commit is contained in:
commit
22f0246932
1 changed files with 9 additions and 0 deletions
|
@ -6907,6 +6907,15 @@ get_data_directory(const char *val)
|
||||||
} else {
|
} else {
|
||||||
return tor_strdup(get_windows_conf_root());
|
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) */
|
#else /* !defined(_WIN32) */
|
||||||
const char *d = val;
|
const char *d = val;
|
||||||
if (!d)
|
if (!d)
|
||||||
|
|
Loading…
Add table
Reference in a new issue