diff options
| author | Elliott Hughes <enh@google.com> | 2013-02-11 20:18:47 +0000 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-02-11 12:20:33 -0800 |
| commit | 44b53ad6818de344e0b499ad8fdbb21fcb0ff2b6 (patch) | |
| tree | 9a2c45004114f53c4cf1f9468a58fe54c58320fa /libc/Android.mk | |
| parent | 8397cdba9424febeaed4068829a5b0174ee1138c (diff) | |
| download | bionic-44b53ad6818de344e0b499ad8fdbb21fcb0ff2b6.zip bionic-44b53ad6818de344e0b499ad8fdbb21fcb0ff2b6.tar.gz bionic-44b53ad6818de344e0b499ad8fdbb21fcb0ff2b6.tar.bz2 | |
Revert "Revert "Pull the pthread_key_t functions out of pthread.c.""
This reverts commit 6260553d48f6fd87ca220270bea8bafdde5726ec
(Removing the accidental libm/Android.mk change.)
Change-Id: I6cddd9857c31facc05636e8221505b3d2344cb75
Diffstat (limited to 'libc/Android.mk')
| -rw-r--r-- | libc/Android.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index c7828cf..d21878a 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -406,7 +406,8 @@ libc_common_src_files += \ bionic/ptrace.c.arm libc_static_common_src_files += \ - bionic/pthread.c.arm \ + bionic/pthread.c.arm \ + bionic/pthread_key.cpp.arm \ # these are used by the static and dynamic versions of the libc # respectively @@ -446,7 +447,8 @@ libc_common_src_files += \ bionic/ptrace.c libc_static_common_src_files += \ - bionic/pthread.c \ + bionic/pthread.c \ + bionic/pthread_key.cpp \ libc_arch_static_src_files := \ bionic/dl_iterate_phdr_static.c @@ -492,7 +494,8 @@ libc_common_src_files += \ bionic/ptrace.c libc_static_common_src_files += \ - bionic/pthread.c + bionic/pthread.c + bionic/pthread_key.cpp \ libc_arch_static_src_files := \ bionic/dl_iterate_phdr_static.c |