diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-08-25 12:20:54 -0700 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-08-25 12:20:54 -0700 |
| commit | 4f9bfdcaca2414c8959986f0a4d73f16cb15e1c4 (patch) | |
| tree | 540bab5498d276cbbfad24c48a7ff989ee8b920a /tests/stdatomic_test.cpp | |
| parent | bfda022dd6fbbcea60e9f52496d90ece514b32da (diff) | |
| parent | f77cc9b224c35fa7d1d71e7c374ef19e47b5f6a5 (diff) | |
Merge RP1A.190822.001
Change-Id: Iaf90835a99d87f6246798efd2cea6fe9f750ea18
Diffstat (limited to 'tests/stdatomic_test.cpp')
| -rw-r--r-- | tests/stdatomic_test.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/stdatomic_test.cpp b/tests/stdatomic_test.cpp index d122d2f39..a9665d18e 100644 --- a/tests/stdatomic_test.cpp +++ b/tests/stdatomic_test.cpp @@ -15,9 +15,14 @@ */ #include <gtest/gtest.h> -// Fool stdatomic.h into not using <atomic>. -#undef _USING_LIBCXX + +#if defined(__ANDROID__) +#include <bits/stdatomic.h> +#else +#undef _USING_LIBCXX //TODO(b/137876753): Remove this #include <stdatomic.h> +#endif + #include <pthread.h> #include <stdint.h> |