Update Marl to 5c6c15322
Changes:
5c6c1532220 Fix Android build
Commands:
./third_party/update-marl.sh --squash
Bug: b/140546382
Change-Id: Ibb733d85c64a183f4fbe1a803d3d569a37e858a1
diff --git a/third_party/marl/include/marl/thread.h b/third_party/marl/include/marl/thread.h
index 1046922..d462602 100644
--- a/third_party/marl/include/marl/thread.h
+++ b/third_party/marl/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;
diff --git a/third_party/marl/src/thread.cpp b/third_party/marl/src/thread.cpp
index 8d46963..a0101bd 100644
--- a/third_party/marl/src/thread.cpp
+++ b/third_party/marl/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++) {
