commit 44b53ad6818de344e0b499ad8fdbb21fcb0ff2b6
author Elliott Hughes <enh@google.com> Mon Feb 11 20:18:47 2013 +0000
committer Elliott Hughes <enh@google.com> Mon Feb 11 12:20:33 2013 -0800
tree 9a2c45004114f53c4cf1f9468a58fe54c58320fa
parent 8397cdba9424febeaed4068829a5b0174ee1138c

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

libc/Android.mk

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 @@
 	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 @@
 	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 @@
 	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