Calin Juravle
631d309268
am 0c8d3b35
: am 8e541b12
: Merge "Moved nameser.h and namser_compat.h to public include dir"
...
* commit '0c8d3b35c6eb07384b0176ab3d1d462bad996e06':
Moved nameser.h and namser_compat.h to public include dir
2014-03-04 18:04:44 +00:00
Calin Juravle
0c8d3b35c6
am 8e541b12
: Merge "Moved nameser.h and namser_compat.h to public include dir"
...
* commit '8e541b12237f597c186820b9e18b059b620bef54':
Moved nameser.h and namser_compat.h to public include dir
2014-03-04 17:58:52 +00:00
Calin Juravle
3f6229cf32
am cc0948d8
: am 4a46a689
: Merge "Moved private dns header to their own dir."
...
* commit 'cc0948d86a50a1b2441552cd0f357ca040855928':
Moved private dns header to their own dir.
2014-03-04 17:55:59 +00:00
Calin Juravle
ff4dfd26a8
am 8121d264
: am 9f2d1bcd
: Merge "Renamed the misleading libc/netbsd directory to libc/dns."
...
* commit '8121d264bc58c6d97edae23981d2646b05fcdf83':
Renamed the misleading libc/netbsd directory to libc/dns.
2014-03-04 17:55:58 +00:00
Calin Juravle
8e541b1223
Merge "Moved nameser.h and namser_compat.h to public include dir"
2014-03-04 17:53:19 +00:00
Calin Juravle
cc0948d86a
am 4a46a689
: Merge "Moved private dns header to their own dir."
...
* commit '4a46a68942d180e28c3e87f08359351245b220b7':
Moved private dns header to their own dir.
2014-03-04 17:19:13 +00:00
Calin Juravle
8121d264bc
am 9f2d1bcd
: Merge "Renamed the misleading libc/netbsd directory to libc/dns."
...
* commit '9f2d1bcd176cb4a6f2bc0cae3f3c786444383476':
Renamed the misleading libc/netbsd directory to libc/dns.
2014-03-04 17:19:13 +00:00
Narayan Kamath
b863c9574e
am 3f985d31
: am caaae7f2
: Merge "Implement pthread_condattr_{get,set}clock."
...
* commit '3f985d31b6fc3fd61f76b71aa05c3c69d853452a':
Implement pthread_condattr_{get,set}clock.
2014-03-04 16:05:46 +00:00
Calin Juravle
569fb9887d
Moved nameser.h and namser_compat.h to public include dir
...
This is part of the upstream sync (Net/Open/Free BSDs expose the
nameser.h in their public headers).
Change-Id: Ib063d4e50586748cc70201a8296cd90d2e48bbcf
2014-03-04 15:07:07 +00:00
Calin Juravle
4a46a68942
Merge "Moved private dns header to their own dir."
2014-03-04 14:25:51 +00:00
Calin Juravle
9f2d1bcd17
Merge "Renamed the misleading libc/netbsd directory to libc/dns."
2014-03-04 14:25:30 +00:00
Narayan Kamath
3f985d31b6
am caaae7f2
: Merge "Implement pthread_condattr_{get,set}clock."
...
* commit 'caaae7f2e9a89df1514ba06d13e9eb5a0f04e94c':
Implement pthread_condattr_{get,set}clock.
2014-03-04 13:41:52 +00:00
Narayan Kamath
caaae7f2e9
Merge "Implement pthread_condattr_{get,set}clock."
2014-03-04 13:37:07 +00:00
Narayan Kamath
51e6cb33e3
Implement pthread_condattr_{get,set}clock.
...
We only support CLOCK_REALTIME and CLOCK_MONOTONIC for now,
so we us a single bit from pthread_cond_t->value to denote
the clock type. Note that this reduces the width of the counter
to 30 bits, but this should be large enough for all practical
purposes.
bug: 13232338
Change-Id: I857e7da64b3ecbb23eeac7c9f3fbd460f60231bd
2014-03-04 11:17:13 +00:00
Elliott Hughes
010d090241
am fea778b3
: am 2c7c79e6
: Merge "Switch to upstream alarm(3)."
...
* commit 'fea778b308be2dd0d75bd757129c3ef62ace3a61':
Switch to upstream alarm(3).
2014-03-04 01:11:01 +00:00
Elliott Hughes
fea778b308
am 2c7c79e6
: Merge "Switch to upstream alarm(3)."
...
* commit '2c7c79e6e5e730553281b6d42e734ee2c532a660':
Switch to upstream alarm(3).
2014-03-04 01:04:22 +00:00
Elliott Hughes
2c7c79e6e5
Merge "Switch to upstream alarm(3)."
2014-03-04 00:58:53 +00:00
Elliott Hughes
aedb00d04e
Switch to upstream alarm(3).
...
The only way the setitimer call can fail is if the unsigned number of seconds is
too large to fit in the kernel's signed number of seconds. If you schedule a
68-year alarm, glibc will fail by returning 0 and BSD will fail by returning -1.
Change-Id: Ic3721b01428f5402d99f31fd7f2ba2cc58805607
2014-03-04 00:58:31 +00:00
Mark Salyzyn
4fc7758e6f
am 337815ff
: am f33df6a6
: Merge "libc: Make calls to new user-space logger (revisit)"
...
* commit '337815ffa2d4c899bf3c2b9798cb90665b497cea':
libc: Make calls to new user-space logger (revisit)
2014-03-03 21:18:08 +00:00
Mark Salyzyn
337815ffa2
am f33df6a6
: Merge "libc: Make calls to new user-space logger (revisit)"
...
* commit 'f33df6a662934cd72a79195773d2745ae8f937d4':
libc: Make calls to new user-space logger (revisit)
2014-03-03 21:12:03 +00:00
Mark Salyzyn
f33df6a662
Merge "libc: Make calls to new user-space logger (revisit)"
2014-03-03 21:05:19 +00:00
Elliott Hughes
1eb606df0a
am 46215a8b
: am dfeb42ed
: Merge "If the kernel doesn\'t have MADV_MERGEABLE, stop asking for it."
...
* commit '46215a8b53e149de3fc28600c2b2eebe66d36716':
If the kernel doesn't have MADV_MERGEABLE, stop asking for it.
2014-03-03 20:55:35 +00:00
Elliott Hughes
29264f4eda
am f6ce4490
: am 15e71cd7
: Merge "Remove deprecated and unused constants from <sys/klog.h>."
...
* commit 'f6ce44900e5b94c18a026ac4ce4d5fd2c51663d4':
Remove deprecated and unused constants from <sys/klog.h>.
2014-03-03 20:55:35 +00:00
Calin Juravle
cecc036970
Moved private dns header to their own dir.
...
Bug: 13219633
Change-Id: I3435ef7564b9ad3c7b54188a0809440993b36c9e
2014-03-03 20:40:41 +00:00
Elliott Hughes
46215a8b53
am dfeb42ed
: Merge "If the kernel doesn\'t have MADV_MERGEABLE, stop asking for it."
...
* commit 'dfeb42ede69a0dbea5735aed5fddaee3f810801d':
If the kernel doesn't have MADV_MERGEABLE, stop asking for it.
2014-03-03 20:31:39 +00:00
Mark Salyzyn
f38292862b
libc: Make calls to new user-space logger (revisit)
...
* TARGET_USES_LOGD is true or false, yes is not valid
* was supposed to be in the libc_bionic definition
Change-Id: I7f15d0fe61205641f7310ba9762df885e6c959d0
2014-03-03 12:30:24 -08:00
Elliott Hughes
dfeb42ede6
Merge "If the kernel doesn't have MADV_MERGEABLE, stop asking for it."
2014-03-03 20:26:12 +00:00
Elliott Hughes
f6ce44900e
am 15e71cd7
: Merge "Remove deprecated and unused constants from <sys/klog.h>."
...
* commit '15e71cd760c35a4eab09b850904581ebbdc9bee3':
Remove deprecated and unused constants from <sys/klog.h>.
2014-03-03 20:21:25 +00:00
Elliott Hughes
9bd9b7dd20
If the kernel doesn't have MADV_MERGEABLE, stop asking for it.
...
Note that a dynamically-linked binary will still probably see two attempts ---
one by the dynamic linker (which will set its copy of the flag so it won't try
again) and then one by the executable itself (which gets a new uninitialized
copy of the flag).
Change-Id: Id6b7e47780f0f24d2ca0384a75373f4824fa8f12
2014-03-03 11:54:21 -08:00
Elliott Hughes
15e71cd760
Merge "Remove deprecated and unused constants from <sys/klog.h>."
2014-03-03 19:01:50 +00:00
Elliott Hughes
e4ab19c67d
Remove deprecated and unused constants from <sys/klog.h>.
...
Change-Id: I23d54b5eaf918859480f927534a3f9e3af602311
2014-03-03 10:57:28 -08:00
Elliott Hughes
019cff957e
am 3c42b739
: am ddad384d
: Merge "Fix build."
...
* commit '3c42b73985817da87c32c2d97a58e5e4f21d48a6':
Fix build.
2014-03-01 02:12:59 +00:00
Elliott Hughes
3c42b73985
am ddad384d
: Merge "Fix build."
...
* commit 'ddad384dbf802bf258e19a8d18f5d9e9fba8f97b':
Fix build.
2014-03-01 02:05:38 +00:00
Elliott Hughes
ddad384dbf
Merge "Fix build."
2014-03-01 01:59:55 +00:00
Elliott Hughes
a8b1eb3fcf
Fix build.
...
Change-Id: I71cde79263d5f5a8382865b8151f65c5c05ea17b
2014-02-28 17:59:29 -08:00
Elliott Hughes
79370b2aee
am 5b9d3ddf
: am 2ec592c3
: Merge "Add recvmmsg and sendmmsg syscalls."
...
* commit '5b9d3ddf372ca47e3065845487a770794021c760':
Add recvmmsg and sendmmsg syscalls.
2014-03-01 01:24:39 +00:00
Elliott Hughes
e63d519946
am 796b7c7c
: am ddc8cc7a
: Merge "Add getprogname/setprogname for BSD compatibility."
...
* commit '796b7c7cf9404b59b2120177d2f2b40ecc58c3c8':
Add getprogname/setprogname for BSD compatibility.
2014-03-01 01:24:38 +00:00
Elliott Hughes
5b9d3ddf37
am 2ec592c3
: Merge "Add recvmmsg and sendmmsg syscalls."
...
* commit '2ec592c338f5c5021f127e92212d156cd909c617':
Add recvmmsg and sendmmsg syscalls.
2014-03-01 01:17:13 +00:00
Elliott Hughes
796b7c7cf9
am ddc8cc7a
: Merge "Add getprogname/setprogname for BSD compatibility."
...
* commit 'ddc8cc7a68415acb0694f7015ea0dae70ea04550':
Add getprogname/setprogname for BSD compatibility.
2014-03-01 01:17:12 +00:00
Elliott Hughes
2ec592c338
Merge "Add recvmmsg and sendmmsg syscalls."
2014-03-01 01:14:23 +00:00
Elliott Hughes
ddc8cc7a68
Merge "Add getprogname/setprogname for BSD compatibility."
2014-03-01 01:12:12 +00:00
Elliott Hughes
692207eb45
Add getprogname/setprogname for BSD compatibility.
...
This is one less change we have to make when porting BSD code.
Bug: https://code.google.com/p/android/issues/detail?id=34898
Change-Id: If9b1a8d16996c7a19abcce8d3a456afc3e105a41
2014-02-28 16:23:27 -08:00
Calin Juravle
8ddc3328f8
am 11e4513d
: am d51db86a
: Merge "Fix locatime.c indentation after sync"
...
* commit '11e4513d328d9ae16ef5aa4b25d886c8bb6049a1':
Fix locatime.c indentation after sync
2014-02-28 18:13:28 +00:00
Calin Juravle
11e4513d32
am d51db86a
: Merge "Fix locatime.c indentation after sync"
...
* commit 'd51db86aafb988aea04355f2b6a6c925d67e5976':
Fix locatime.c indentation after sync
2014-02-28 18:07:48 +00:00
Calin Juravle
d51db86aaf
Merge "Fix locatime.c indentation after sync"
2014-02-28 18:02:22 +00:00
Calin Juravle
daceb01b7c
am 3926e9f4
: am 4ab29a3e
: Merge "Update tzcode to 2013i"
...
* commit '3926e9f4039929d745692310a8a458e81ae72a52':
Update tzcode to 2013i
2014-02-28 17:49:53 +00:00
Calin Juravle
3926e9f403
am 4ab29a3e
: Merge "Update tzcode to 2013i"
...
* commit '4ab29a3e4a797cff05a3a1a6fea3db5a800ac5ba':
Update tzcode to 2013i
2014-02-28 17:44:15 +00:00
Calin Juravle
4ab29a3e4a
Merge "Update tzcode to 2013i"
2014-02-28 17:40:09 +00:00
Calin Juravle
d892892e8e
Fix locatime.c indentation after sync
...
Bug: 12246757
Change-Id: I8186e75f4899161af48cbf66e8f907dac0a326a2
2014-02-28 17:15:00 +00:00
Elliott Hughes
77ed5f6b15
am 8fa8b75b
: am e9db4a97
: Merge "Vastly reduce the number of read(2)s done in tzload."
...
* commit '8fa8b75b54990cdabbfa108b92ace9cf511d45c0':
Vastly reduce the number of read(2)s done in tzload.
2014-02-28 16:35:04 +00:00