[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 12/14: runtime: android: need to use a usab
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 12/14: runtime: android: need to use a usable, writable location for android apps, so use the tmp path that we set up to point to the app's home directory. |
Date: |
Thu, 12 Mar 2015 19:38:14 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch android
in repository gnuradio.
commit 3f06a0197d7279fb564402b8707d05aa553db067
Author: Tom Rondeau <address@hidden>
Date: Sun Jan 18 11:24:33 2015 -0500
runtime: android: need to use a usable, writable location for android apps,
so use the tmp path that we set up to point to the app's home directory.
---
gnuradio-runtime/lib/prefs.cc | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/gnuradio-runtime/lib/prefs.cc b/gnuradio-runtime/lib/prefs.cc
index b7fcaad..ee9b403 100644
--- a/gnuradio-runtime/lib/prefs.cc
+++ b/gnuradio-runtime/lib/prefs.cc
@@ -59,7 +59,12 @@ namespace gr {
{
std::vector<std::string> fnames;
+#if ANDROID
+ fs::path dir = fs::path(gr::tmp_path());
+#else
fs::path dir = prefsdir();
+#endif
+
if(!fs::is_directory(dir))
return fnames;
@@ -74,7 +79,12 @@ namespace gr {
// Find if there is a ~/.gnuradio/config.conf file and add this to
// the end of the file list to override any preferences in the
// installed path config files.
+#if ANDROID
+ fs::path homedir = fs::path(gr::tmp_path());
+#else
fs::path homedir = fs::path(gr::appdata_path());
+#endif
+
homedir = homedir/".gnuradio/config.conf";
if(fs::exists(homedir)) {
fnames.push_back(homedir.string());
- [Commit-gnuradio] [gnuradio] branch android created (now 1e31c64), git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 08/14: volk: Using C checks for Volk C FLags instead of CXX., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 05/14: fft: android: problems with wisdom files and MEASURE version of FFTW. Defaulting to suboptimal ESTIMATE until we figure it out., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 04/14: runtime: android: issues related to vmcircbuf; only mmap_tmpfile version working currently., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 09/14: runtime: trying to use ANDROID to define certain behavior, git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 11/14: fft: defined a setting for the FFTW plan options if android or not., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 02/14: logger: android: adding Android log functions for different logging levels., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 13/14: runtime: android: more conversion of statics vars to static functions., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 12/14: runtime: android: need to use a usable, writable location for android apps, so use the tmp path that we set up to point to the app's home directory.,
git <=
- [Commit-gnuradio] [gnuradio] 06/14: volk: using hypot instead of cabsf., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 10/14: cmake: changed to using C checks for headers instead of C++., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 01/14: cmake: android: adding exceptions and atomic to Boost deps; ordering in this patch is important., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 03/14: runtime: android: Android does not support pthread_setaffinity_np; turned this into a nop call., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 07/14: volk: force some support required for android builds; boost unit tests not working yet., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 14/14: cmake: android: adding toolchain file for building., git, 2015/03/12