diff options
| author | Elliott Hughes <enh@google.com> | 2013-10-09 21:28:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 21:28:51 -0700 |
| commit | 2d38f0c1c7ccb123a9a71dcabeb3650d8f5832b7 (patch) | |
| tree | 0f790cec55d417eadcb07281b0b78144cf09687d /libc/Android.mk | |
| parent | 7e049ba47039477a16895450e76c4561bf2350f5 (diff) | |
| parent | 21d70d5fd8ff2823a6879d59c7d5a8d6c3e0ce8b (diff) | |
| download | bionic-2d38f0c1c7ccb123a9a71dcabeb3650d8f5832b7.zip bionic-2d38f0c1c7ccb123a9a71dcabeb3650d8f5832b7.tar.gz bionic-2d38f0c1c7ccb123a9a71dcabeb3650d8f5832b7.tar.bz2 | |
am 21d70d5f: am 39385aa7: Merge "Clean up the cpuacct cruft."
* commit '21d70d5fd8ff2823a6879d59c7d5a8d6c3e0ce8b':
Clean up the cpuacct cruft.
Diffstat (limited to 'libc/Android.mk')
| -rw-r--r-- | libc/Android.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 967399b..f6e4663 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -80,14 +80,12 @@ libc_common_src_files := \ bionic/bindresvport.c \ bionic/bionic_clone.c \ bionic/clearenv.c \ - bionic/cpuacct.c \ bionic/daemon.c \ bionic/err.c \ bionic/ether_aton.c \ bionic/ether_ntoa.c \ bionic/fdprintf.c \ bionic/flockfile.c \ - bionic/fork.c \ bionic/ftime.c \ bionic/ftok.c \ bionic/fts.c \ @@ -124,12 +122,7 @@ libc_common_src_files := \ bionic/sched_getcpu.c \ bionic/semaphore.c \ bionic/send.c \ - bionic/setegid.c \ - bionic/seteuid.c \ bionic/setpgrp.c \ - bionic/setresuid.c \ - bionic/setreuid.c \ - bionic/setuid.c \ bionic/sigblock.c \ bionic/siginterrupt.c \ bionic/siglist.c \ @@ -226,6 +219,7 @@ libc_bionic_src_files := \ bionic/__errno.cpp \ bionic/eventfd_read.cpp \ bionic/eventfd_write.cpp \ + bionic/fork.cpp \ bionic/futimens.cpp \ bionic/getauxval.cpp \ bionic/getcwd.cpp \ @@ -248,7 +242,9 @@ libc_bionic_src_files := \ bionic/sbrk.cpp \ bionic/scandir.cpp \ bionic/sched_getaffinity.cpp \ + bionic/setegid.cpp \ bionic/__set_errno.cpp \ + bionic/seteuid.cpp \ bionic/setlocale.cpp \ bionic/signalfd.cpp \ bionic/sigwait.cpp \ |