Dmitriy Ivanov
3b6c264ae9
am f49da77e
: am f9a28bd7
: am c6b5834c
: Merge "Remove page level mprotects"
...
* commit 'f49da77e4a9cea6f2f5d8772b02f63ee4ab4e338':
Remove page level mprotects
2014-05-14 01:56:32 +00:00
Elliott Hughes
d8e8909f95
am 46afef32
: am 9b1e2a14
: am 3557f2f6
: Merge "Fix <sys/endian.h> uint32_t build failures."
...
* commit '46afef329fee8de35d092e3f1e635d11d6f6e91d':
Fix <sys/endian.h> uint32_t build failures.
2014-05-14 01:56:31 +00:00
Dmitriy Ivanov
f49da77e4a
am f9a28bd7
: am c6b5834c
: Merge "Remove page level mprotects"
...
* commit 'f9a28bd79df2abb17304f0cfafb143c9e79e3377':
Remove page level mprotects
2014-05-14 01:51:26 +00:00
Elliott Hughes
46afef329f
am 9b1e2a14
: am 3557f2f6
: Merge "Fix <sys/endian.h> uint32_t build failures."
...
* commit '9b1e2a14f9dad7c4cc19db9fee5afdc1f01340b4':
Fix <sys/endian.h> uint32_t build failures.
2014-05-14 01:51:25 +00:00
Dmitriy Ivanov
f9a28bd79d
am c6b5834c
: Merge "Remove page level mprotects"
...
* commit 'c6b5834ceb3df72608a8fe3526a2db337e504512':
Remove page level mprotects
2014-05-14 01:50:02 +00:00
Elliott Hughes
9b1e2a14f9
am 3557f2f6
: Merge "Fix <sys/endian.h> uint32_t build failures."
...
* commit '3557f2f61b9cc736d245aff1e979500cc399e491':
Fix <sys/endian.h> uint32_t build failures.
2014-05-14 01:46:44 +00:00
Dmitriy Ivanov
c6b5834ceb
Merge "Remove page level mprotects"
2014-05-14 01:45:50 +00:00
Elliott Hughes
3557f2f61b
Merge "Fix <sys/endian.h> uint32_t build failures."
2014-05-14 01:43:15 +00:00
Elliott Hughes
135b103fd9
Fix <sys/endian.h> uint32_t build failures.
...
Change-Id: I833b51318f0bf7749073859b7ffacc668c27558e
2014-05-13 18:42:12 -07:00
Dmitriy Ivanov
bc23e530c4
Remove page level mprotects
...
Freeing block mprotects on the page which it turn
may lead to application crash if linker subsequently
tries to modify another block on the page.
Bug: 14895266
Change-Id: I8ff7f5df467d7be184242de652032b3c84e24b76
2014-05-13 18:34:48 -07:00
Elliott Hughes
aa8e269d29
am 239347d9
: am cb6f6243
: am 17f8ef87
: Merge "Flesh out <arpa/inet.h>."
...
* commit '239347d97effbd711f07da75def7620a1557988b':
Flesh out <arpa/inet.h>.
2014-05-14 01:21:59 +00:00
Elliott Hughes
6033068d17
am 62c24c83
: am f984afd0
: am 57722375
: Merge "We don\'t need two copies of <nsswitch.h>."
...
* commit '62c24c83538258fa2cd7e31d9b616bbb32d6398f':
We don't need two copies of <nsswitch.h>.
2014-05-14 01:21:58 +00:00
Elliott Hughes
239347d97e
am cb6f6243
: am 17f8ef87
: Merge "Flesh out <arpa/inet.h>."
...
* commit 'cb6f6243dbf12dd76f50910c476af01519b4be41':
Flesh out <arpa/inet.h>.
2014-05-14 01:16:05 +00:00
Elliott Hughes
62c24c8353
am f984afd0
: am 57722375
: Merge "We don\'t need two copies of <nsswitch.h>."
...
* commit 'f984afd0ef2185d493c03830537460edf34baefc':
We don't need two copies of <nsswitch.h>.
2014-05-14 01:16:05 +00:00
Elliott Hughes
cb6f6243db
am 17f8ef87
: Merge "Flesh out <arpa/inet.h>."
...
* commit '17f8ef87b565d88c3b391d6d8de8818dec74c4d5':
Flesh out <arpa/inet.h>.
2014-05-14 01:10:55 +00:00
Elliott Hughes
f984afd0ef
am 57722375
: Merge "We don\'t need two copies of <nsswitch.h>."
...
* commit '5772237588a606cad2c7a26d24e9de3c0a62ce81':
We don't need two copies of <nsswitch.h>.
2014-05-14 01:10:55 +00:00
Elliott Hughes
17f8ef87b5
Merge "Flesh out <arpa/inet.h>."
2014-05-14 01:09:01 +00:00
Elliott Hughes
6a41b0fb0e
Flesh out <arpa/inet.h>.
...
Use the upstream OpenBSD implementations of these functions.
Also ensure we have symbols for htonl, htons, ntohl, and ntohs.
gtest doesn't like us using the macro versions in ASSERT_EQ.
Bug: 14840760
Change-Id: I68720e9aca14838df457d2bb27b999d5818ac2b5
2014-05-13 18:08:29 -07:00
Elliott Hughes
5772237588
Merge "We don't need two copies of <nsswitch.h>."
2014-05-14 01:06:11 +00:00
Elliott Hughes
eed3d0d1f3
We don't need two copies of <nsswitch.h>.
...
Change-Id: I3f874326d96f41249f5c9b1b3c2885f858589029
2014-05-13 18:05:29 -07:00
Sreeram Ramachandran
d591b2413a
am 4d61e7b5
: am 59a4a10f
: am d57d710f
: Merge "Fix build (take two)."
...
* commit '4d61e7b5493dc6cafaa3348482521226ddd1e286':
Fix build (take two).
2014-05-14 00:56:58 +00:00
Sreeram Ramachandran
4d61e7b549
am 59a4a10f
: am d57d710f
: Merge "Fix build (take two)."
...
* commit '59a4a10f097a0bdd8d5e9aa52ce1139ccabf82b1':
Fix build (take two).
2014-05-14 00:51:49 +00:00
Sreeram Ramachandran
47b93faa48
Fix build (take two).
...
Make sure __netdClientDispatch is defined in the same set of libraries that
refer to it (e.g.: with connect.cpp).
(cherry picked from commit 8205a61248
)
Change-Id: I86d7bf2df5bde09f75a35b204eac0e1361747e22
2014-05-13 17:48:52 -07:00
Sreeram Ramachandran
59a4a10f09
am d57d710f
: Merge "Fix build (take two)."
...
* commit 'd57d710f0847009038297d1ffcc1613198fb48d4':
Fix build (take two).
2014-05-14 00:47:06 +00:00
Sreeram Ramachandran
d57d710f08
Merge "Fix build (take two)."
2014-05-14 00:43:47 +00:00
Sreeram Ramachandran
8205a61248
Fix build (take two).
...
Make sure __netdClientDispatch is defined in the same set of libraries that
refer to it (e.g.: with connect.cpp).
Change-Id: I86d7bf2df5bde09f75a35b204eac0e1361747e22
2014-05-13 17:24:03 -07:00
Sreeram Ramachandran
5907e23907
am 9d58ec78
: am cd004d2d
: am 2ed09d44
: Merge "Fix build."
...
* commit '9d58ec78b33296325982e1b87edcb54d0fb7a012':
Fix build.
2014-05-14 00:11:25 +00:00
Sreeram Ramachandran
9d58ec78b3
am cd004d2d
: am 2ed09d44
: Merge "Fix build."
...
* commit 'cd004d2d0117243908b71b2b4c7036d79de5344c':
Fix build.
2014-05-14 00:05:40 +00:00
Sreeram Ramachandran
cd004d2d01
am 2ed09d44
: Merge "Fix build."
...
* commit '2ed09d44ecdaf656a598052d155a813897239042':
Fix build.
2014-05-14 00:00:58 +00:00
Sreeram Ramachandran
2677d133dd
Fix build.
...
(cherry picked from commit 06e8796ee9
)
Change-Id: I33293d8bc62cbb22e23a704c4242e7e9d3fce7c5
2014-05-13 16:59:38 -07:00
Sreeram Ramachandran
2ed09d44ec
Merge "Fix build."
2014-05-13 23:57:07 +00:00
Sreeram Ramachandran
06e8796ee9
Fix build.
...
Change-Id: I33293d8bc62cbb22e23a704c4242e7e9d3fce7c5
2014-05-13 16:30:12 -07:00
Sreeram Ramachandran
20f8da95c0
am af36c9ae
: am 9b5bc6fd
: am 79b56f4b
: Merge "Introduce netd_client, a dynamic library that talks to netd."
...
* commit 'af36c9ae139b08109fa9ffad923b542e3a64f612':
Introduce netd_client, a dynamic library that talks to netd.
2014-05-13 22:20:38 +00:00
Sreeram Ramachandran
af36c9ae13
am 9b5bc6fd
: am 79b56f4b
: Merge "Introduce netd_client, a dynamic library that talks to netd."
...
* commit '9b5bc6fd7ed97900a1d5d8427108f26cf8a0aa09':
Introduce netd_client, a dynamic library that talks to netd.
2014-05-13 22:16:11 +00:00
Sreeram Ramachandran
9b5bc6fd7e
am 79b56f4b
: Merge "Introduce netd_client, a dynamic library that talks to netd."
...
* commit '79b56f4b0b9fa52fbf2e79c073d28efd21ae724d':
Introduce netd_client, a dynamic library that talks to netd.
2014-05-13 22:11:48 +00:00
Sreeram Ramachandran
79b56f4b0b
Merge "Introduce netd_client, a dynamic library that talks to netd."
2014-05-13 22:07:26 +00:00
Elliott Hughes
05ba476c11
am 5c0fe1a3
: am b00435d1
: am 0ccef7ec
: Merge "Upgrade to tzdata2014c."
...
* commit '5c0fe1a39d35886e30792f3b6023bc9799e5ebc2':
Upgrade to tzdata2014c.
2014-05-13 18:42:26 +00:00
Elliott Hughes
6755bb3833
am 7aba9ef3
: am 492e8f72
: am 4482091b
: Merge "Consistently use #if defined(__BIONIC__) in tests."
...
* commit '7aba9ef3d00201d4410c5db0bf0853df24b94243':
Consistently use #if defined(__BIONIC__) in tests.
2014-05-13 18:42:26 +00:00
Elliott Hughes
5c0fe1a39d
am b00435d1
: am 0ccef7ec
: Merge "Upgrade to tzdata2014c."
...
* commit 'b00435d15c6320f81a92c16d0bd94ae05730e26f':
Upgrade to tzdata2014c.
2014-05-13 18:38:31 +00:00
Elliott Hughes
7aba9ef3d0
am 492e8f72
: am 4482091b
: Merge "Consistently use #if defined(__BIONIC__) in tests."
...
* commit '492e8f72505f4c14df3f37ed00bd6b62ce3893a2':
Consistently use #if defined(__BIONIC__) in tests.
2014-05-13 18:38:31 +00:00
Elliott Hughes
b00435d15c
am 0ccef7ec
: Merge "Upgrade to tzdata2014c."
...
* commit '0ccef7ec5294b34902e07c26db55891d3eddb2be':
Upgrade to tzdata2014c.
2014-05-13 18:35:49 +00:00
Elliott Hughes
492e8f7250
am 4482091b
: Merge "Consistently use #if defined(__BIONIC__) in tests."
...
* commit '4482091b1d1611aa395931656b94bfd8ffd583bf':
Consistently use #if defined(__BIONIC__) in tests.
2014-05-13 18:35:49 +00:00
Sreeram Ramachandran
ceb5bd787c
Introduce netd_client, a dynamic library that talks to netd.
...
The library exists outside bionic. It is dynamically loaded, to replace selected
standard socket syscalls with versions that talk to netd.
Change connect() to use the library if available.
(cherry picked from commit 3a6b627a14df8111b03e452f2df4b5f4938e0e49)
Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
2014-05-13 11:30:03 -07:00
Elliott Hughes
a8e0f0e633
am 1d8130e8
: am 56b18bb4
: am a26dd781
: Merge "Add getmntent_r to our collection of <mntent.h> compatibility stubs."
...
* commit '1d8130e8b30e25ad8e3e33bbd0d08f8e44f73a35':
Add getmntent_r to our collection of <mntent.h> compatibility stubs.
2014-05-13 18:27:32 +00:00
Elliott Hughes
0ccef7ec52
Merge "Upgrade to tzdata2014c."
2014-05-13 18:27:30 +00:00
Elliott Hughes
4482091b1d
Merge "Consistently use #if defined(__BIONIC__) in tests."
2014-05-13 18:26:47 +00:00
Elliott Hughes
121cb5f4a7
Upgrade to tzdata2014c.
...
From the release notes:
Changes affecting near-future time stamps
Egypt observes DST starting 2014-05-15 at 24:00.
(Thanks to Ahmad El-Dardiry and Gunther Vermier.)
Details have not been announced, except that DST will not be
observed during Ramadan. Guess that DST will stop during the same
Ramadan dates as Morocco, and that Egypt's future spring and fall
transitions will be the same as 2010 when it last observed DST,
namely April's last Friday at 00:00 to September's last Thursday at
23:00 standard time. Also, guess that Ramadan transitions will be
at 00:00 standard time.
Change-Id: I6a20cae02a314871acbd52cb90fcbebd37625810
2014-05-13 11:23:18 -07:00
Elliott Hughes
1d8130e8b3
am 56b18bb4
: am a26dd781
: Merge "Add getmntent_r to our collection of <mntent.h> compatibility stubs."
...
* commit '56b18bb4d2926dd5b17a79c97867748b22a8f0f8':
Add getmntent_r to our collection of <mntent.h> compatibility stubs.
2014-05-13 18:21:35 +00:00
Elliott Hughes
063525c61d
Consistently use #if defined(__BIONIC__) in tests.
...
I've also switched some tests to be positive rather than negative,
because !defined is slightly harder to reason about and there are
only two cases: bionic and glibc.
Change-Id: I8d3ac40420ca5aead3e88c69cf293f267273c8ef
2014-05-13 11:19:57 -07:00
Elliott Hughes
56b18bb4d2
am a26dd781
: Merge "Add getmntent_r to our collection of <mntent.h> compatibility stubs."
...
* commit 'a26dd781fe675cf94c62183da27622eb83ff6fa7':
Add getmntent_r to our collection of <mntent.h> compatibility stubs.
2014-05-13 18:18:20 +00:00