[Commit-gnuradio] [gnuradio] 09/14: runtime: trying to use ANDROID to define certain behavior

[git]

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

trondeau pushed a commit to branch android
in repository gnuradio.

commit c2cd7a6266e68cb7fc1538f67c6d984803a9c43a
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 30 13:12:25 2014 -0500

    runtime: trying to use ANDROID to define certain behavior
---
 gnuradio-runtime/lib/CMakeLists.txt   | 2 +-
 gnuradio-runtime/lib/thread/thread.cc | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnuradio-runtime/lib/CMakeLists.txt 
b/gnuradio-runtime/lib/CMakeLists.txt
index f88001f..11ac100 100644
--- a/gnuradio-runtime/lib/CMakeLists.txt
+++ b/gnuradio-runtime/lib/CMakeLists.txt
@@ -155,7 +155,7 @@ IF(HAVE_WINDOWS_H)
 ENDIF(HAVE_WINDOWS_H)
 
 #need to link with librt on ubuntu 11.10 for shm_*
-if(LINUX)
+if(LINUX AND !ANDROID)
     list(APPEND gnuradio_runtime_libs rt)
 endif()
 
diff --git a/gnuradio-runtime/lib/thread/thread.cc 
b/gnuradio-runtime/lib/thread/thread.cc
index 796899e..44dbb37 100644
--- a/gnuradio-runtime/lib/thread/thread.cc
+++ b/gnuradio-runtime/lib/thread/thread.cc
@@ -317,7 +317,12 @@ namespace gr {
         CPU_SET(n, &set);
       }
 
+#if !ANDROID
       int ret = pthread_setaffinity_np(thread, len, &set);
+#else
+      int ret = 0;
+#endif
+
       if(ret != 0) {
         std::stringstream s;
         s << "thread_unbind failed with error: " << ret << std::endl;