Squashed 'third_party/marl/' changes from c5127112545..5c6c1532220

5c6c1532220 Fix Android build

git-subtree-dir: third_party/marl
git-subtree-split: 5c6c1532220096dd470549312053a445d7d95a2c

include/marl/thread.h

diff --git a/include/marl/thread.h b/include/marl/thread.h
index 1046922..d462602 100644
--- a/include/marl/thread.h
+++ b/include/marl/thread.h
@@ -51,7 +51,8 @@
   struct Affinity {
     // supported is true if marl supports controlling thread affinity for this
     // platform.
-#if defined(_WIN32) || defined(__linux__) || defined(__FreeBSD__)
+#if defined(_WIN32) || (defined(__linux__) && !defined(__ANDROID__)) || \
+    defined(__FreeBSD__)
     static constexpr bool supported = true;
 #else
     static constexpr bool supported = false;

src/thread.cpp

diff --git a/src/thread.cpp b/src/thread.cpp
index 8d46963..a0101bd 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -145,7 +145,7 @@
       }
     }
   }
-#elif defined(__linux__)
+#elif defined(__linux__) && !defined(__ANDROID__)
   auto thread = pthread_self();
   cpu_set_t cpuset;
   CPU_ZERO(&cpuset);
@@ -374,7 +374,7 @@
       return;
     }
 
-#if defined(__linux__)
+#if defined(__linux__) && !defined(__ANDROID__)
     cpu_set_t cpuset;
     CPU_ZERO(&cpuset);
     for (size_t i = 0; i < count; i++) {