[Commit-gnuradio] [gnuradio] 10/21: 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]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch android
in repository gnuradio.

commit c8f0e4fba79a379364b8b646be73e0fd5e92bbf1
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 b303ffd..7381c78 100644
--- a/gnuradio-runtime/lib/prefs.cc
+++ b/gnuradio-runtime/lib/prefs.cc
@@ -62,7 +62,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;
 
@@ -77,7 +82,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());