[core] Naive atomic type for ARMv5

std::atomic<bool> is implemented lock free which doesn't work
on ARMv5 and seems like the compiler is generating bogus code.

This workaround is a naive implementation using regular mutexes.

2 files changed, 4 insertions, 4 deletions

diff --git a/platform/android/src/async_task.cpp b/platform/android/src/async_task.cpp
index 7b78eadb0c..6a9263baff 100644
--- a/platform/android/src/async_task.cpp
+++ b/platform/android/src/async_task.cpp
@@ -1,9 +1,9 @@
 #include "run_loop_impl.hpp"
 
 #include <mbgl/util/async_task.hpp>
+#include <mbgl/util/atomic.hpp>
 #include <mbgl/util/run_loop.hpp>
 
-#include <atomic>
 #include <functional>
 
 namespace mbgl {
@@ -45,7 +45,7 @@ private:
 
     // TODO: Use std::atomic_flag if we ever drop
     // support for ARMv5
-    std::atomic<bool> queued;
+    util::Atomic<bool> queued;
     std::function<void()> task;
 };
 
diff --git a/platform/android/src/run_loop_impl.hpp b/platform/android/src/run_loop_impl.hpp
index 5cf7231175..d855728b60 100644
--- a/platform/android/src/run_loop_impl.hpp
+++ b/platform/android/src/run_loop_impl.hpp
@@ -2,10 +2,10 @@
 
 #include "jni.hpp"
 
+#include <mbgl/util/atomic.hpp>
 #include <mbgl/util/chrono.hpp>
 #include <mbgl/util/run_loop.hpp>
 
-#include <atomic>
 #include <list>
 #include <memory>
 #include <mutex>
@@ -47,7 +47,7 @@ private:
     bool detach = false;
 
     ALooper* loop = nullptr;
-    std::atomic<bool> running;
+    util::Atomic<bool> running;
 
     std::recursive_mutex mtx;
     std::list<Runnable*> runnables;