commit 7558e4bc78ecd98534824adfa486720666304267
author Elliott Hughes <enh@google.com> Tue Jan 22 08:00:07 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 22 08:00:07 2013 -0800
tree 029e340b406faedb57f5f37cbe4ee41c6512f51c
parent 7fb52e56a67d42291fd3b9e72d18e581ff4ab080
parent 00724b61779e04ff586dad4c9634572712b8ef70

am 00724b61: Merge "test_atomics is an ARM specific test"

* commit '00724b61779e04ff586dad4c9634572712b8ef70':
  test_atomics is an ARM specific test

tests/bionic/libc/Android.mk

diff --git a/tests/bionic/libc/Android.mk b/tests/bionic/libc/Android.mk
index 52ef01e..9b0cf70 100644
--- a/tests/bionic/libc/Android.mk
+++ b/tests/bionic/libc/Android.mk
@@ -154,7 +154,6 @@
     other/bench_locks.c \
     other/test_aligned.c \
     other/test_arc4random.c \
-    other/test_atomics.c \
     other/test_sysconf.c \
     other/test_system.c \
     other/test_thread_max.c \
@@ -163,6 +162,11 @@
     other/test_timer_create3.c \
     other/test_vfprintf_leak.c \
 
+ifeq ($(TARGET_ARCH),arm)
+sources += \
+    other/test_atomics.c
+endif
+
 $(call device-test, $(sources))
 
 # The relocations test is a bit special, since we need