Elliott Hughes
36545d2e76
Merge "Make all of ndk_cruft.cpp one big extern "C"."
...
am: 9dec0a775b
* commit '9dec0a775b07f58d133ae5c35713e7cf60ddcc7c':
Make all of ndk_cruft.cpp one big extern "C".
2015-12-07 23:16:43 +00:00
Elliott Hughes
1190230f33
Merge "Fix stdio static initializers to make both clang and GCC happy."
...
am: 7bd33cdf15
* commit '7bd33cdf15c26c5855628eb2ac0e7d0f52189010':
Fix stdio static initializers to make both clang and GCC happy.
2015-12-07 23:16:39 +00:00
Elliott Hughes
568ad51d80
Merge "Revert "Revert "Remove __sinit and __sdidinit."""
...
am: c4eef1fb5b
* commit 'c4eef1fb5ba325317e94b598c6fbf8e4c4bf83e1':
Revert "Revert "Remove __sinit and __sdidinit.""
2015-12-07 23:14:29 +00:00
Elliott Hughes
9dec0a775b
Merge "Make all of ndk_cruft.cpp one big extern "C"."
2015-12-07 19:14:46 +00:00
Elliott Hughes
cfd5a46b09
Make all of ndk_cruft.cpp one big extern "C".
...
Change-Id: Iddd9b5f36e661e443fa13d12326e72df8c0d209c
2015-12-07 11:13:23 -08:00
Elliott Hughes
7bd33cdf15
Merge "Fix stdio static initializers to make both clang and GCC happy."
2015-12-07 19:10:32 +00:00
Elliott Hughes
29ee6397a8
Fix stdio static initializers to make both clang and GCC happy.
...
Previously only clang was happy. GCC said:
error: missing initializer for field 'wcio_mbstate_in' of 'struct wchar_io_data'
Change-Id: I25a11b64f4dfa22a5dd5daded152191fe2cfacaf
2015-12-07 11:07:15 -08:00
Elliott Hughes
c4eef1fb5b
Merge "Revert "Revert "Remove __sinit and __sdidinit."""
2015-12-07 18:19:07 +00:00
Elliott Hughes
bb46afd6c4
Revert "Revert "Remove __sinit and __sdidinit.""
...
This reverts commit c8bae05f3f
.
We were breaking init (ueventd) because we initialize system properties
before we initialize stdio. The new system property implementation uses
stdio to read from /property_contexts, so we end up touching stdio data
structures before they've been initialized.
This second attempt takes things further by removing the stdio initialization
function altogether. The data structures for stdin/stdout/stderr can be
statically initialized as data, and -- since we already had to give the
atexit implementation a backdoor for stdio -- we can just admit that we
need to clean up stdio, and that we always do so last.
This patch also removes the 17 statically pre-allocated file structures,
so the first fopen will now allocate a block of 10 (the usual overflow
behavior). I did this just to make my life simpler, but it's not actually
necessary to remove it if we want it back.
Change-Id: I936b2eb5e88e4ebaf5516121872b71fc88e5609c
2015-12-05 07:30:59 -08:00
Dimitry Ivanov
d5ce2a93af
Merge "Allow dlopening public libs using absolute path"
...
am: e371ae68ac
* commit 'e371ae68ac0d6d39cacf5edc893bda2f4a61e883':
Allow dlopening public libs using absolute path
2015-12-05 05:29:52 +00:00
Dimitry Ivanov
e371ae68ac
Merge "Allow dlopening public libs using absolute path"
2015-12-05 05:25:57 +00:00
Dimitry Ivanov
22840aab47
Allow dlopening public libs using absolute path
...
dlopen on isolated namespaces should be able to open
public libraries using absolute path not only soname.
Bug: http://b/25853820
Change-Id: If574a67853dc51226f0f376e9e2d108316002f84
2015-12-04 21:21:35 -08:00
Elliott Hughes
f4e511ecf9
Merge "Revert "Remove __sinit and __sdidinit.""
...
am: 0d89913e74
* commit '0d89913e74981cd51532e66a2e2f138392be4de1':
Revert "Remove __sinit and __sdidinit."
2015-12-05 01:58:40 +00:00
Elliott Hughes
0d89913e74
Merge "Revert "Remove __sinit and __sdidinit.""
2015-12-05 01:53:21 +00:00
Elliott Hughes
c8bae05f3f
Revert "Remove __sinit and __sdidinit."
...
This reverts commit 4371961e00
.
This broke booting; ueventd crashes with a null pointer dereference
somewhere in __sfp (but the kernel doesn't unwind, so I don't know
what was calling __sfp).
Change-Id: I65375fdfdf1d339a06558b4057b580cacd6324e2
2015-12-04 17:47:20 -08:00
Tom Cherry
071234cfd9
Merge "Do not create prop files for ctl.* properties"
...
am: 4ade5195f1
* commit '4ade5195f188b84ce3599c71ef058d040b141da4':
Do not create prop files for ctl.* properties
2015-12-05 00:27:56 +00:00
Tom Cherry
4ade5195f1
Merge "Do not create prop files for ctl.* properties"
2015-12-05 00:21:46 +00:00
Elliott Hughes
70d477c913
Merge "Fix GCC build."
...
am: ef2ba3dbf9
* commit 'ef2ba3dbf986257ded12531fe15bf0d1d4a87d50':
Fix GCC build.
2015-12-04 16:02:27 -08:00
Tom Cherry
21eadee6e9
Do not create prop files for ctl.* properties
...
Change-Id: Ia6660c68c9e0cb89938751dbc0747ee038394778
2015-12-04 15:55:32 -08:00
Elliott Hughes
ef2ba3dbf9
Merge "Fix GCC build."
2015-12-04 23:54:15 +00:00
Elliott Hughes
8766edc098
Fix GCC build.
...
error: '__sdidinit' initialized and declared 'extern' [-Werror]
Change-Id: I97d9c174da6a99ca61b72572dfb4694813372a60
2015-12-04 15:53:25 -08:00
Elliott Hughes
a3f5912129
Merge "Track rename from base/ to android-base/."
...
am: 0b40c13a5a
* commit '0b40c13a5a2da127cb1203d33a3d170671b39247':
Track rename from base/ to android-base/.
2015-12-04 23:33:45 +00:00
Elliott Hughes
942d81c246
Merge "Remove __sinit and __sdidinit."
...
am: 2558b11230
* commit '2558b112300e0a27590b9e31f627fe94594fa6a0':
Remove __sinit and __sdidinit.
2015-12-04 23:33:39 +00:00
Elliott Hughes
0b40c13a5a
Merge "Track rename from base/ to android-base/."
2015-12-04 23:30:09 +00:00
Elliott Hughes
939a7e0119
Track rename from base/ to android-base/.
...
Change-Id: I0a4592945400b1fa6892bf7c1fa8659fd711efa3
2015-12-04 15:27:46 -08:00
Elliott Hughes
2558b11230
Merge "Remove __sinit and __sdidinit."
2015-12-04 23:27:07 +00:00
Tom Cherry
e049fa71cb
Merge "add checks for initialization for system properties"
...
am: 136bf8fa45
* commit '136bf8fa45b243b56a8f2543d43970f253118cd7':
add checks for initialization for system properties
2015-12-04 15:09:42 -08:00
Tom Cherry
136bf8fa45
Merge "add checks for initialization for system properties"
2015-12-04 23:06:31 +00:00
Tom Cherry
6ed51c0e85
add checks for initialization for system properties
...
If a __system_property* function is called before
__system_properties_init() then the app will will abort. This commit
returns either an error code or a safe return value instead.
Bug 26027140
Change-Id: I95ffd143e9563658ab67a397991e84fb4c46ab77
2015-12-04 13:26:47 -08:00
Yabin Cui
21cca02a52
Merge "Clear pthread_internal_t allocated on user provided stack."
...
am: 2452cf3c33
* commit '2452cf3c332fdfdae6b6b27b57acaa6786a91c87':
Clear pthread_internal_t allocated on user provided stack.
2015-12-04 01:05:37 +00:00
Yabin Cui
2452cf3c33
Merge "Clear pthread_internal_t allocated on user provided stack."
2015-12-04 00:58:05 +00:00
Yabin Cui
304348af19
Clear pthread_internal_t allocated on user provided stack.
...
Several parts in pthread_internal_t should be initialized
to zero, like tls, key_data and thread_local_dtors. So
just clear the whole pthread_internal_t is more convenient.
Bug: 25990348
Change-Id: Ibb6d1200ea5e6e1afbc77971f179197e8239f6ea
2015-12-03 16:51:20 -08:00
Yabin Cui
fb3708640f
Merge "Don\'t use StringPrintf() in gtest runner."
...
am: 514f46b74c
* commit '514f46b74c5424eb10f21349654e90fcf69b3b10':
Don't use StringPrintf() in gtest runner.
2015-12-04 00:35:30 +00:00
Yabin Cui
514f46b74c
Merge "Don't use StringPrintf() in gtest runner."
2015-12-04 00:29:47 +00:00
Yabin Cui
a32fc8685d
Don't use StringPrintf() in gtest runner.
...
Change-Id: I0cd0b3cbb952c65b1c449e88ce12964b93029538
2015-12-03 16:28:03 -08:00
Tom Cherry
e670e2f859
Merge "Remove c++14\'isms from system_properties"
...
am: b35a2fb370
* commit 'b35a2fb370db711fcea38441a1295cd542fc3daa':
Remove c++14'isms from system_properties
2015-12-03 23:53:24 +00:00
Dimitry Ivanov
0ee40ef239
Merge "libm: stop exporting __muldc3"
...
am: bf20d0226b
* commit 'bf20d0226b28a029f4cade8dc8f3aa38d1e51a1a':
libm: stop exporting __muldc3
2015-12-03 23:53:13 +00:00
Tom Cherry
b35a2fb370
Merge "Remove c++14'isms from system_properties"
2015-12-03 23:48:54 +00:00
Dimitry Ivanov
bf20d0226b
Merge "libm: stop exporting __muldc3"
2015-12-03 23:44:59 +00:00
Tom Cherry
845e24a05e
Remove c++14'isms from system_properties
...
Change-Id: If78e7d2770e8f8321f0d1824c3c52f93820dd325
2015-12-03 15:40:23 -08:00
Dimitry Ivanov
a2ead18657
libm: stop exporting __muldc3
...
Bug: http://b/26004493
Change-Id: I991268d5e7b59bca646da25d0ad90a1cb4a9d4b9
2015-12-03 15:25:37 -08:00
Tom Cherry
84bc4f5cc7
Merge "Separate properties by selabel"
...
am: 376b94f1e7
* commit '376b94f1e777375eb9ebb04a882b898aafa94625':
Separate properties by selabel
2015-12-03 22:58:48 +00:00
Tom Cherry
376b94f1e7
Merge "Separate properties by selabel"
2015-12-03 22:55:32 +00:00
Yabin Cui
b561043d3a
Merge "Improve unit test runner."
...
am: f57ae1cd43
* commit 'f57ae1cd433f2bdc02cec6b0d2666f7708f1fc37':
Improve unit test runner.
2015-12-03 22:34:44 +00:00
Yabin Cui
f57ae1cd43
Merge "Improve unit test runner."
2015-12-03 22:29:29 +00:00
Elliott Hughes
4371961e00
Remove __sinit and __sdidinit.
...
We're eagerly initializing stdio now, so this can all be simplified.
Change-Id: Icb288f8dd0ee08f02bea0d23670f75e78bed6b99
2015-12-03 13:23:03 -08:00
Yabin Cui
d4c9b9d5ac
Improve unit test runner.
...
1. Read unit test's output while the test is running. Previously
we only read output when the test finishes, which has trouble
when the test outputs too many stuff.
2. Report failed unit test's exit code. It is useful when the
test doesn't fail in ASSERT_xxx, but in somewhere else.
Bug: 25392375
Change-Id: Ie90823337f7c2ee25fa489a5534801d991258f95
2015-12-03 13:20:39 -08:00
Dan Willemsen
5bfa22ceab
Merge "Re-add putw for LP32"
...
am: 22dca83e1c
* commit '22dca83e1c37d3b465b9fa432bbf7cb4bd0df868':
Re-add putw for LP32
2015-12-03 02:01:07 +00:00
Dan Willemsen
22dca83e1c
Merge "Re-add putw for LP32"
2015-12-03 01:56:00 +00:00
Dan Willemsen
b9055518fc
Re-add putw for LP32
...
This was missed when switching to LOCAL_SRC_FILES_EXCLUDE
Change-Id: I6ea23c9eb31abe11e0ec4abfc2ee2f2a43c76ce2
2015-12-02 17:31:32 -08:00