Elliott Hughes
ba55c8984e
am 5691dcfc: am ea66004c: Merge "Fix mips __fadvise64.S build failure."
...
* commit '5691dcfc0d8b1418e53d75b3c3428f8f65a87727':
Fix mips __fadvise64.S build failure.
2014-09-12 19:17:48 +00:00
Elliott Hughes
c3932cca0b
am 65e61977: am 176c3278: Merge "Add posix_fadvise(3)." into lmp-dev
...
* commit '65e619775e3f4517edc7ac68c6b85a9443a67da7':
Add posix_fadvise(3).
2014-09-12 19:17:03 +00:00
Elliott Hughes
612db11844
am db1e9581: am 33df10f2: Merge "Add posix_fadvise(3)."
...
* commit 'db1e9581098ad19465d2d81fbe368743b648a071':
Add posix_fadvise(3).
2014-09-12 19:16:56 +00:00
Elliott Hughes
5691dcfc0d
am ea66004c: Merge "Fix mips __fadvise64.S build failure."
...
* commit 'ea66004c4a051e40c49314d808e7359634f6c641':
Fix mips __fadvise64.S build failure.
2014-09-11 17:32:03 +00:00
Lorenzo Colitti
77f01f4306
am 993a2315: am 33a73bfa: When comparing DNS server configs, also compare number of servers
...
* commit '993a2315a7ddc786ce9180258aa3db498bf9326e':
When comparing DNS server configs, also compare number of servers
2014-09-11 17:27:10 +00:00
Elliott Hughes
ea66004c4a
Merge "Fix mips __fadvise64.S build failure."
2014-09-11 17:12:49 +00:00
Elliott Hughes
9990b3973b
Fix mips __fadvise64.S build failure.
...
Bug: 12449798
Change-Id: I0663b741108ba2f1d286904d6414b3ff4d475551
2014-09-11 10:10:08 -07:00
Elliott Hughes
65e619775e
am 176c3278: Merge "Add posix_fadvise(3)." into lmp-dev
...
* commit '176c32787c53e720bf4664592fd0b8ea4ffbdd75':
Add posix_fadvise(3).
2014-09-11 16:08:32 +00:00
Elliott Hughes
db1e958109
am 33df10f2: Merge "Add posix_fadvise(3)."
...
* commit '33df10f284a8adbf58f9734c0f43537db4206b2c':
Add posix_fadvise(3).
2014-09-11 15:58:49 +00:00
Elliott Hughes
33df10f284
Merge "Add posix_fadvise(3)."
2014-09-11 15:46:44 +00:00
Elliott Hughes
b587f339db
Add posix_fadvise(3).
...
(cherry-pick of 00008263782e484020420c606f7d145fe7d0a4d8.)
Bug: 12449798
Change-Id: I07cbf3f670a0d1304b68148325a774f266b5c433
2014-09-11 08:45:46 -07:00
Elliott Hughes
176c32787c
Merge "Add posix_fadvise(3)." into lmp-dev
2014-09-11 15:43:05 +00:00
Elliott Hughes
0000826378
Add posix_fadvise(3).
...
Bug: 12449798
Change-Id: I07cbf3f670a0d1304b68148325a774f266b5c433
2014-09-10 20:30:23 -07:00
Lorenzo Colitti
993a2315a7
am 33a73bfa: When comparing DNS server configs, also compare number of servers
...
* commit '33a73bfa0712c483830e4c9abbf4d6a0551478bf':
When comparing DNS server configs, also compare number of servers
2014-09-11 00:13:20 +00:00
Lorenzo Colitti
33a73bfa07
When comparing DNS server configs, also compare number of servers
...
Bug: 16070602
Change-Id: I605f1cca50b08479ebcad290b3bd179f59be8a96
2014-09-11 08:36:12 +09:00
Lorenzo Colitti
b5e7bd0013
am da0ed4cb: am c71483c0: Merge "When comparing DNS server configs, also compare number of servers"
...
* commit 'da0ed4cbfa10eb3f6a48ef116ae0441239daf7bf':
When comparing DNS server configs, also compare number of servers
2014-09-09 15:03:50 +00:00
Lorenzo Colitti
da0ed4cbfa
am c71483c0: Merge "When comparing DNS server configs, also compare number of servers"
...
* commit 'c71483c0b38a6b4f2675f0bffa221dcf175c34ac':
When comparing DNS server configs, also compare number of servers
2014-09-09 10:42:23 +00:00
Lorenzo Colitti
c71483c0b3
Merge "When comparing DNS server configs, also compare number of servers"
2014-09-09 10:22:18 +00:00
Lorenzo Colitti
bce18c9163
When comparing DNS server configs, also compare number of servers
...
Bug: 16070602
Change-Id: I605f1cca50b08479ebcad290b3bd179f59be8a96
2014-09-09 19:20:26 +09:00
Dmitriy Ivanov
9c8ff91dcc
am 06bd5e2d: am 3c3624f3: Merge "Load libraries in breadth-first order"
...
* commit '06bd5e2d0ade82b9fc70fd8928c1746ca529a2f4':
Load libraries in breadth-first order
2014-09-09 01:25:51 +00:00
Dmitriy Ivanov
06bd5e2d0a
am 3c3624f3: Merge "Load libraries in breadth-first order"
...
* commit '3c3624f3df14590e7213d35c3b39a0a11c7d2d34':
Load libraries in breadth-first order
2014-09-09 01:11:41 +00:00
Dmitriy Ivanov
3c3624f3df
Merge "Load libraries in breadth-first order"
2014-09-09 00:49:38 +00:00
Elliott Hughes
d7928dc803
am 5574335d: am 671f96cd: Merge "Ensure __set_errno is still visible on LP32."
...
* commit '5574335dc5f380b96aa1f93caeceeeb1bc69bbe2':
Ensure __set_errno is still visible on LP32.
2014-09-09 00:11:52 +00:00
Elliott Hughes
4a454760b5
am e70e541e: am 201f36d2: Merge "Don\'t expose non-standard basename_r and dirname_r in LP64."
...
* commit 'e70e541e7f97ddef3c262bbd71a01710d9f57e65':
Don't expose non-standard basename_r and dirname_r in LP64.
2014-09-09 00:11:52 +00:00
Elliott Hughes
5574335dc5
am 671f96cd: Merge "Ensure __set_errno is still visible on LP32."
...
* commit '671f96cd440d306dc2baf5e8631e927cd1aa759d':
Ensure __set_errno is still visible on LP32.
2014-09-09 00:05:24 +00:00
Elliott Hughes
e70e541e7f
am 201f36d2: Merge "Don\'t expose non-standard basename_r and dirname_r in LP64."
...
* commit '201f36d23bb778b29c8d305fa40a41990e0487bc':
Don't expose non-standard basename_r and dirname_r in LP64.
2014-09-09 00:05:23 +00:00
Elliott Hughes
671f96cd44
Merge "Ensure __set_errno is still visible on LP32."
2014-09-08 23:47:53 +00:00
Elliott Hughes
011e111d29
Ensure __set_errno is still visible on LP32.
...
The use of the .hidden directive to avoid going via the PLT for
__set_errno had the side-effect of actually making __set_errno
hidden (which is odd because assembler directives don't usually
affect symbols defined in a different file --- you can't even
create a weak reference to a symbol that's defined in a different
file).
This change switches the system call stubs over to a new always-hidden
__set_errno_internal and has a visible __set_errno on LP32 just for
binary compatibility with old NDK apps.
(cherry-pick of 7efad83d430f4d824f2aaa75edea5106f6ff8aae.)
Bug: 17423135
Change-Id: I6b6d7a05dda85f923d22e5ffd169a91e23499b7b
2014-09-08 16:46:50 -07:00
Elliott Hughes
201f36d23b
Merge "Don't expose non-standard basename_r and dirname_r in LP64."
2014-09-08 23:46:04 +00:00
Elliott Hughes
cf5fc80c3e
Don't expose non-standard basename_r and dirname_r in LP64.
...
(cherry-pick of f0e9458ea596227720fa745df15f5357f6c0c8f6.)
Bug: 17407423
Change-Id: I47fe499a4c396bf09d7b78fd828728d04777398b
2014-09-08 16:44:48 -07:00
Elliott Hughes
eeb13c6bdb
am 938473a7: resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp
...
* commit '938473a7f031822d7449624f5844c07d23814422':
Ensure __set_errno is still visible on LP32.
2014-09-08 23:32:32 +00:00
Elliott Hughes
938473a7f0
resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp
...
Change-Id: I3994c3c69e187e08d69642e097de14b5040c5b3b
2014-09-08 16:21:24 -07:00
Elliott Hughes
7efad83d43
Ensure __set_errno is still visible on LP32.
...
The use of the .hidden directive to avoid going via the PLT for
__set_errno had the side-effect of actually making __set_errno
hidden (which is odd because assembler directives don't usually
affect symbols defined in a different file --- you can't even
create a weak reference to a symbol that's defined in a different
file).
This change switches the system call stubs over to a new always-hidden
__set_errno_internal and has a visible __set_errno on LP32 just for
binary compatibility with old NDK apps.
Bug: 17423135
Change-Id: I6b6d7a05dda85f923d22e5ffd169a91e23499b7b
2014-09-08 15:36:21 -07:00
Dmitriy Ivanov
14669a939d
Load libraries in breadth-first order
...
This patch fixes the problem with symbol search order
for dlsym(RTLD_DEFAULT/RTLD_NEXT, .) by loading libraries
and ld_preloads in correct order.
Bug: https://code.google.com/p/android/issues/detail?id=74255
Change-Id: If1ba5c807322409faa914e27ecb675e2c4541f0d
Attempt: 2
2014-09-08 13:02:50 -07:00
Elliott Hughes
b614b05942
am 2af51cac: Merge "resolved conflicts for merge of c8f6b82f to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
...
* commit '2af51cacde8e8e15639352f96e46cbc9e9e6a4f6':
Don't expose non-standard basename_r and dirname_r in LP64.
2014-09-08 18:52:42 +00:00
Elliott Hughes
347e873bfb
am 6b779c6b: am 51c8355d: Add arc4random_addrandom binary compatibility.
...
* commit '6b779c6b61ec662f19f9ea30fd003c770799196c':
Add arc4random_addrandom binary compatibility.
2014-09-08 18:52:42 +00:00
Elliott Hughes
2af51cacde
Merge "resolved conflicts for merge of c8f6b82f to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
2014-09-08 18:41:54 +00:00
Elliott Hughes
08df25419f
resolved conflicts for merge of c8f6b82f to lmp-dev-plus-aosp
...
Change-Id: I03a4645eb5fbb54e41da25018729b270ba0ed48e
2014-09-08 11:41:30 -07:00
Elliott Hughes
6b779c6b61
am 51c8355d: Add arc4random_addrandom binary compatibility.
...
* commit '51c8355d5cf4b83ccd2ad250ca4c61a616356c2b':
Add arc4random_addrandom binary compatibility.
2014-09-08 18:36:55 +00:00
Elliott Hughes
b03d3102c3
am ffa8672b: am d3d89f0d: Merge "Add arc4random_addrandom binary compatibility."
...
* commit 'ffa8672bd5722b9bb2f13dcabffb2814b2edd0ea':
Add arc4random_addrandom binary compatibility.
2014-09-08 18:26:26 +00:00
Elliott Hughes
ffa8672bd5
am d3d89f0d: Merge "Add arc4random_addrandom binary compatibility."
...
* commit 'd3d89f0d28aba2db9f11cc0a9b3a865fa1d9d265':
Add arc4random_addrandom binary compatibility.
2014-09-08 18:11:52 +00:00
Elliott Hughes
c8f6b82f87
Merge "Don't expose non-standard basename_r and dirname_r in LP64." into lmp-dev
2014-09-08 18:07:08 +00:00
Elliott Hughes
d3d89f0d28
Merge "Add arc4random_addrandom binary compatibility."
2014-09-08 17:53:04 +00:00
Elliott Hughes
fc829736e1
Add arc4random_addrandom binary compatibility.
...
This was in <stdlib.h> in older releases. It's no longer used, but we can
preserve backwards compatibility by making it a no-op.
(cherry-pick of 51c8355d5cf4b83ccd2ad250ca4c61a616356c2b.)
Bug: 16205834
Change-Id: Idde7b46df4f253e39675600bcf82352879a716e7
2014-09-08 10:52:28 -07:00
Elliott Hughes
51c8355d5c
Add arc4random_addrandom binary compatibility.
...
This was in <stdlib.h> in older releases. It's no longer used, but we can
preserve backwards compatibility by making it a no-op.
Bug: 16205834
Change-Id: Idde7b46df4f253e39675600bcf82352879a716e7
2014-09-08 10:47:45 -07:00
Christopher Ferris
d790900d5f
am 9e7abe2e: am b4673c41: Merge "Add dlmalloc_usable_size for 32 bit arches."
...
* commit '9e7abe2e60c16ca3ffb3d1839c040fe2c3d34551':
Add dlmalloc_usable_size for 32 bit arches.
2014-09-06 20:37:54 +00:00
Christopher Ferris
9e7abe2e60
am b4673c41: Merge "Add dlmalloc_usable_size for 32 bit arches."
...
* commit 'b4673c41025f3a16804aff8438c2810c739a11ef':
Add dlmalloc_usable_size for 32 bit arches.
2014-09-06 20:28:37 +00:00
Christopher Ferris
7f6006d232
am eb1dd673: am 47ed03f7: Merge "Add dlmalloc_usable_size for 32 bit arches." into lmp-dev
...
* commit 'eb1dd673ecb660a56c19a04697a14ed56db5eb91':
Add dlmalloc_usable_size for 32 bit arches.
2014-09-06 20:24:21 +00:00
Christopher Ferris
b4673c4102
Merge "Add dlmalloc_usable_size for 32 bit arches."
2014-09-06 20:17:02 +00:00
Christopher Ferris
eb1dd673ec
am 47ed03f7: Merge "Add dlmalloc_usable_size for 32 bit arches." into lmp-dev
...
* commit '47ed03f70c6c9addc7f05e4ee4dc71c96d215105':
Add dlmalloc_usable_size for 32 bit arches.
2014-09-06 20:14:17 +00:00