torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'ahf/android-gp-fixes-bulk' into 'main'

Browse Source 
Bulk Android path changes

Closes #40487

See merge request tpo/core/tor!762
This commit is contained in:
David Goulet
2023-09-18 13:12:36 +00:00
parent 8425e1e575 a8b573a322
commit 7278c1554d
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/config/config.c
+16
View File
@@ -483,6 +483,13 @@ static const config_var_t option_vars_[] = {
#ifdef _WIN32
V(GeoIPFile, FILENAME, "<default>"),
V(GeoIPv6File, FILENAME, "<default>"),
#elif defined(__ANDROID__)
/* Android apps use paths that are configured at runtime.
* /data/local/tmp is guaranteed to exist, but will only be
* usable by the 'shell' and 'root' users, so this fallback is
* for debugging only. */
V(GeoIPFile, FILENAME, "/data/local/tmp/geoip"),
V(GeoIPv6File, FILENAME, "/data/local/tmp/geoip6"),
#else
V(GeoIPFile, FILENAME,
SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
@@ -6900,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)