Update Marl to 5c6c15322

Changes: 5c6c1532220 Fix Android build Commands: ./third_party/update-marl.sh --squash Bug: b/140546382 Change-Id: Ibb733d85c64a183f4fbe1a803d3d569a37e858a1

Update Marl to 5c6c15322
9ac8855b · Ben Clayton · 47da2d37 · 9d009d0d · 9ac8855b · 9ac8855b
Commit 9ac8855b authored Jun 16, 2020 by Ben Clayton
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

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

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

No files found.
--- a/third_party/marl/include/marl/thread.h
+++ b/third_party/marl/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/third_party/marl/src/thread.cpp
+++ b/third_party/marl/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++) {