Calin Juravle
170c91c696
am 60fcdc3e
: am b5f4106c
: am 837abf04
: Merge "Fix bionic-unit-tests-glibc-run target"
...
* commit '60fcdc3ecb949ed9cdbbd878c5c6bf9f8613deef':
Fix bionic-unit-tests-glibc-run target
2014-05-07 22:35:23 +00:00
Torne (Richard Coles)
a1d145c465
am de070ae5
: am 551466e7
: am 35cff760
: Merge "Test that relro sharing actually saves memory."
...
* commit 'de070ae5255306eddffa452d56779aa8869403cf':
Test that relro sharing actually saves memory.
2014-05-07 22:35:22 +00:00
Calin Juravle
9b6b11b0f9
am 71ee6889
: am ed4e01f7
: am e292875c
: Merge "Reserve some space in sem_t for the future."
...
* commit '71ee6889457eb238c6a1bcbba5ecf0587f8b71c8':
Reserve some space in sem_t for the future.
2014-05-07 22:35:22 +00:00
Calin Juravle
7fbe52b9af
am 478a1b57
: am c2787015
: am b6c48b20
: Merge "Allow for better utmp logging."
...
* commit '478a1b57bd44220373cedc72813ae7a9e26f328a':
Allow for better utmp logging.
2014-05-07 22:35:21 +00:00
Calin Juravle
c5413a55e1
am 2b180ea8
: am b742e82e
: am fc2af0ca
: Merge "Fix ino_t and suseconds_t"
...
* commit '2b180ea80c79db5887c03e7d6cf2b40e7036f8e0':
Fix ino_t and suseconds_t
2014-05-07 22:35:20 +00:00
Calin Juravle
363eb3de3a
am 2b4313a2
: am adf5e63a
: am 764a8882
: Merge "Leave more space for extensions in pthread_rwlockattr_t"
...
* commit '2b4313a2737a9df2c0ce2e05077980ce638643c3':
Leave more space for extensions in pthread_rwlockattr_t
2014-05-07 22:35:19 +00:00
Elliott Hughes
c47ec798bc
am 5d73936f
: am 1ecf7633
: am 6ad9cd41
: Merge "Change the interface for fatal logging."
...
* commit '5d73936fabd2cdcb336ec7c84d52e91a7d5e76de':
Change the interface for fatal logging.
2014-05-07 22:35:19 +00:00
Elliott Hughes
a62a28d1d9
Add basic tests for fsync/fdatasync.
...
Bug: 14613980
Change-Id: Ie8002c2a1abae07295b7bdb33772764767c03d37
2014-05-07 14:30:33 -07:00
Dmitriy Ivanov
ae7e6c5ab3
am 7fb0b5d2
: am f837cbdc
: Merge "Add missing test for atexit test suite."
...
* commit '7fb0b5d26d24ad260605c7cad8df996f7e2c2106':
Add missing test for atexit test suite.
2014-05-07 20:57:29 +00:00
Dmitriy Ivanov
7fb0b5d26d
am f837cbdc
: Merge "Add missing test for atexit test suite."
...
* commit 'f837cbdc27a0f024bdc9898177a8ac05817441a7':
Add missing test for atexit test suite.
2014-05-07 20:52:47 +00:00
Dmitriy Ivanov
f837cbdc27
Merge "Add missing test for atexit test suite."
2014-05-07 20:49:00 +00:00
Elliott Hughes
62fcc2f6f0
am b40f4243
: am 8ec38997
: Merge "Give bionic\'s __ANDROID_API__ a more reasonable value."
...
* commit 'b40f424353b6dfadabcc0df6e3875d3c82b13a64':
Give bionic's __ANDROID_API__ a more reasonable value.
2014-05-07 20:29:00 +00:00
Calin Juravle
60fcdc3ecb
am b5f4106c
: am 837abf04
: Merge "Fix bionic-unit-tests-glibc-run target"
...
* commit 'b5f4106c85dabd33e88dabdeef98223a847a6772':
Fix bionic-unit-tests-glibc-run target
2014-05-07 20:28:53 +00:00
Torne (Richard Coles)
de070ae525
am 551466e7
: am 35cff760
: Merge "Test that relro sharing actually saves memory."
...
* commit '551466e778ff00b4468442790d169810322e4190':
Test that relro sharing actually saves memory.
2014-05-07 20:28:43 +00:00
Calin Juravle
71ee688945
am ed4e01f7
: am e292875c
: Merge "Reserve some space in sem_t for the future."
...
* commit 'ed4e01f7060b80e62d4936068d0cda1b76ab4650':
Reserve some space in sem_t for the future.
2014-05-07 20:28:40 +00:00
Calin Juravle
478a1b57bd
am c2787015
: am b6c48b20
: Merge "Allow for better utmp logging."
...
* commit 'c27870158ae54e06c39384722b519f06c4521dc7':
Allow for better utmp logging.
2014-05-07 20:28:39 +00:00
Calin Juravle
2b180ea80c
am b742e82e
: am fc2af0ca
: Merge "Fix ino_t and suseconds_t"
...
* commit 'b742e82e90e2606e67bf173736b21f79448c7293':
Fix ino_t and suseconds_t
2014-05-07 20:28:39 +00:00
Calin Juravle
2b4313a273
am adf5e63a
: am 764a8882
: Merge "Leave more space for extensions in pthread_rwlockattr_t"
...
* commit 'adf5e63aca6dd4c77b0baa785e95e3e739018a72':
Leave more space for extensions in pthread_rwlockattr_t
2014-05-07 20:28:38 +00:00
Elliott Hughes
5d73936fab
am 1ecf7633
: am 6ad9cd41
: Merge "Change the interface for fatal logging."
...
* commit '1ecf7633737d66cc411a4ca628fe0776b0fc5940':
Change the interface for fatal logging.
2014-05-07 20:28:28 +00:00
Elliott Hughes
b40f424353
am 8ec38997
: Merge "Give bionic\'s __ANDROID_API__ a more reasonable value."
...
* commit '8ec38997ef44c12dc4cac0f19148a44ee70eba74':
Give bionic's __ANDROID_API__ a more reasonable value.
2014-05-07 20:03:42 +00:00
Elliott Hughes
8ec38997ef
Merge "Give bionic's __ANDROID_API__ a more reasonable value."
2014-05-07 19:58:21 +00:00
Elliott Hughes
4aa2e6a32a
Give bionic's __ANDROID_API__ a more reasonable value.
...
This matches what frameworks/base does with Build.VERSION and means that
bionic's version number will always sort >= than any released version.
This should prevent confusion in code that builds both against bionic
and the NDK.
(Note that <sys/cdefs.h> drags this in, so it's always in the namespace.)
Bug: 14613709
Change-Id: I91fb745920e848a6b20f2f5797c0a7d6cde6c032
2014-05-07 12:57:51 -07:00
Dmitriy Ivanov
6396da98cb
Add missing test for atexit test suite.
...
Change-Id: I3d14d7df1da53ccef534c106633593551ab6a7cb
2014-05-07 12:29:54 -07:00
Calin Juravle
b5f4106c85
am 837abf04
: Merge "Fix bionic-unit-tests-glibc-run target"
...
* commit '837abf04667c29db178fd28f500537429a18be30':
Fix bionic-unit-tests-glibc-run target
2014-05-07 19:10:08 +00:00
Calin Juravle
837abf0466
Merge "Fix bionic-unit-tests-glibc-run target"
2014-05-07 18:31:11 +00:00
Calin Juravle
0e9d7fccb9
Fix bionic-unit-tests-glibc-run target
...
Configure multilib for bionic-unit-tests-glibc-run target (the path to
the host executable was already patched to support multilib build but
the multilib itself wasn't configured).
Change-Id: If533fbdb19bc737e543cf85a0787505458f24579
2014-05-07 19:06:30 +01:00
The Android Automerger
cc5cad3af9
merge in master-release history after reset to 8cfe8c1d40
2014-05-07 09:10:14 -07:00
Torne (Richard Coles)
551466e778
am 35cff760
: Merge "Test that relro sharing actually saves memory."
...
* commit '35cff760dfc5d9d1432955503ffff02286ac20ef':
Test that relro sharing actually saves memory.
2014-05-07 15:30:28 +00:00
Torne (Richard Coles)
35cff760df
Merge "Test that relro sharing actually saves memory."
2014-05-07 15:25:44 +00:00
Calin Juravle
ed4e01f706
am e292875c
: Merge "Reserve some space in sem_t for the future."
...
* commit 'e292875cf55265bea7f78049e31d50c15a3a34e0':
Reserve some space in sem_t for the future.
2014-05-07 14:09:52 +00:00
Calin Juravle
c27870158a
am b6c48b20
: Merge "Allow for better utmp logging."
...
* commit 'b6c48b20e4aa9a0e0068980eb305dc522a680900':
Allow for better utmp logging.
2014-05-07 14:09:52 +00:00
Calin Juravle
b742e82e90
am fc2af0ca
: Merge "Fix ino_t and suseconds_t"
...
* commit 'fc2af0ca47cd5017838b495687784c82c080f9d2':
Fix ino_t and suseconds_t
2014-05-07 14:09:50 +00:00
Calin Juravle
adf5e63aca
am 764a8882
: Merge "Leave more space for extensions in pthread_rwlockattr_t"
...
* commit '764a88821893f18d343d5a784a5b2047d4c11d88':
Leave more space for extensions in pthread_rwlockattr_t
2014-05-07 14:09:49 +00:00
Calin Juravle
e292875cf5
Merge "Reserve some space in sem_t for the future."
2014-05-07 14:04:32 +00:00
Calin Juravle
b6c48b20e4
Merge "Allow for better utmp logging."
2014-05-07 14:04:22 +00:00
Calin Juravle
fc2af0ca47
Merge "Fix ino_t and suseconds_t"
2014-05-07 14:04:12 +00:00
Calin Juravle
764a888218
Merge "Leave more space for extensions in pthread_rwlockattr_t"
2014-05-07 14:04:01 +00:00
The Android Automerger
14c1512e56
merge in master-release history after reset to 59effda9ca
2014-05-07 05:49:18 -07:00
Elliott Hughes
1ecf763373
am 6ad9cd41
: Merge "Change the interface for fatal logging."
...
* commit '6ad9cd41bc3ae27b8c8a1f6489d6ceb9921e6ad1':
Change the interface for fatal logging.
2014-05-07 04:07:38 +00:00
Elliott Hughes
6ad9cd41bc
Merge "Change the interface for fatal logging."
2014-05-07 04:04:28 +00:00
Elliott Hughes
c78368f04f
Change the interface for fatal logging.
...
This more general interface lets liblog give us any fatal log message,
regardless of source. This means we can remove the special case for
LOG_ALWAYS_FATAL with a simpler scheme that automatically works for
the VM too.
Change-Id: Ia6dbf7c3dbabf223081bd5159294835d954bb067
2014-05-06 20:37:22 -07:00
Elliott Hughes
8cfe8c1d40
am c46ffbd5
: am 4a7afa48
: am e05df251
: Merge "Fix a gethnamaddr.c warning that\'s already fixed upstream."
...
* commit 'c46ffbd51e48a8902db18b5f98d767766063c236':
Fix a gethnamaddr.c warning that's already fixed upstream.
2014-05-06 20:52:55 +00:00
Elliott Hughes
c46ffbd51e
am 4a7afa48
: am e05df251
: Merge "Fix a gethnamaddr.c warning that\'s already fixed upstream."
...
* commit '4a7afa4863668931a7253633ea0d42071598a96f':
Fix a gethnamaddr.c warning that's already fixed upstream.
2014-05-06 20:49:20 +00:00
Elliott Hughes
4a7afa4863
am e05df251
: Merge "Fix a gethnamaddr.c warning that\'s already fixed upstream."
...
* commit 'e05df25145eda8ca59db5eb03cf5dbf8c7714870':
Fix a gethnamaddr.c warning that's already fixed upstream.
2014-05-06 20:46:16 +00:00
Elliott Hughes
e05df25145
Merge "Fix a gethnamaddr.c warning that's already fixed upstream."
2014-05-06 20:42:10 +00:00
Elliott Hughes
80a4b70efd
am 33ba85cb
: am 856e6a35
: am 89ca3c5a
: Merge "Sync with upstream OpenBSD wcsftime.c."
...
* commit '33ba85cbd6807bd15f7b197a0807f6a95b6e57b5':
Sync with upstream OpenBSD wcsftime.c.
2014-05-06 20:29:36 +00:00
Elliott Hughes
33ba85cbd6
am 856e6a35
: am 89ca3c5a
: Merge "Sync with upstream OpenBSD wcsftime.c."
...
* commit '856e6a35bf350a7923c1e283c1816572adfbe1dd':
Sync with upstream OpenBSD wcsftime.c.
2014-05-06 20:25:31 +00:00
Elliott Hughes
856e6a35bf
am 89ca3c5a
: Merge "Sync with upstream OpenBSD wcsftime.c."
...
* commit '89ca3c5aec19b3fa9bdc9982e31c0516d6077797':
Sync with upstream OpenBSD wcsftime.c.
2014-05-06 20:23:37 +00:00
Elliott Hughes
89ca3c5aec
Merge "Sync with upstream OpenBSD wcsftime.c."
2014-05-06 20:21:03 +00:00
Elliott Hughes
3e5f0c9849
Fix a gethnamaddr.c warning that's already fixed upstream.
...
We're still way out of sync, but this cleans up a tiny corner.
Change-Id: I51e76601785bf351d6418841b56e08a900a84d82
2014-05-06 11:23:40 -07:00