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

5c6c1532220 Fix Android build git-subtree-dir: third_party/marl git-subtree-split: 5c6c1532220096dd470549312053a445d7d95a2c

Squashed 'third_party/marl/' changes from c5127112545..5c6c1532220
9d009d0d · Ben Clayton · 32b1d4b9 · 9d009d0d · 9d009d0d
Commit 9d009d0d authored Jun 16, 2020 by Ben Clayton
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

thread.h include/marl/thread.h +2 -1

thread.cpp src/thread.cpp +2 -2

No files found.
--- a/include/marl/thread.h
+++ b/include/marl/thread.h
@@ -51,7 +51,8 @@ class Thread {
  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;

--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -145,7 +145,7 @@ Thread::Affinity Thread::Affinity::all(
      }
    }
  }
-#elif defined(__linux__)
+#elif defined(__linux__) && !defined(__ANDROID__)
  auto thread = pthread_self();
  cpu_set_t cpuset;
  CPU_ZERO(&cpuset);
@@ -374,7 +374,7 @@ class Thread::Impl {
      return;
    }

-#if defined(__linux__)
+#if defined(__linux__) && !defined(__ANDROID__)
    cpu_set_t cpuset;
    CPU_ZERO(&cpuset);
    for (size_t i = 0; i < count; i++) {