diff options
| author | Elliott Hughes <enh@google.com> | 2013-01-22 15:40:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-01-22 15:40:03 +0000 |
| commit | 00724b61779e04ff586dad4c9634572712b8ef70 (patch) | |
| tree | 029e340b406faedb57f5f37cbe4ee41c6512f51c | |
| parent | 8c5e84dd6b934d3efa8a16a1e4bddd5720172d05 (diff) | |
| parent | 88573c10cff78e5eefd0125c6cf55fdda660b451 (diff) | |
| download | extras-00724b61779e04ff586dad4c9634572712b8ef70.tar.gz | |
Merge "test_atomics is an ARM specific test"
| -rw-r--r-- | tests/bionic/libc/Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/bionic/libc/Android.mk b/tests/bionic/libc/Android.mk index 52ef01e5..9b0cf704 100644 --- a/tests/bionic/libc/Android.mk +++ b/tests/bionic/libc/Android.mk @@ -154,7 +154,6 @@ sources := \ 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 @@ sources := \ 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 |