OSDN Git Service
Tom Cherry [Fri, 11 Dec 2015 01:44:03 +0000 (17:44 -0800)]
Merge "Do not set properties in bionic_systrace" am:
e46ded5ce1
am:
2b268b38ad
* commit '
2b268b38ade7434a866a1bd10ff7b38cbb232917':
Do not set properties in bionic_systrace
Dimitry Ivanov [Fri, 11 Dec 2015 01:41:17 +0000 (17:41 -0800)]
Merge "Revert "Add /odm/lib to shared lib search path"" am:
cb025e55f7
am:
8bad646e8d
* commit '
8bad646e8dae16b47fa1c6ee1213f76df3046739':
Revert "Add /odm/lib to shared lib search path"
Tom Cherry [Thu, 10 Dec 2015 23:14:23 +0000 (15:14 -0800)]
Merge "Do not set properties in bionic_systrace"
am:
e46ded5ce1
* commit '
e46ded5ce1582202cb809c907128e423e58ce7ed':
Do not set properties in bionic_systrace
Tom Cherry [Thu, 10 Dec 2015 23:05:15 +0000 (23:05 +0000)]
Merge "Do not set properties in bionic_systrace"
Tom Cherry [Thu, 10 Dec 2015 21:21:46 +0000 (13:21 -0800)]
Do not set properties in bionic_systrace
Currently, if the debug.atrace.tags.enableflags property is not found,
it is set to a safe value such that a pointer to this property can be
stored for later access. This may result in selinux denials because not
all processes write permissions for this property or permission to
connect to the property write socket at all.
Change I6d953c0c281fd72ad3eba8a479fd258023579b5b writes this property to
a safe value upon boot, which greatly decreases the cases in which this
property will not be accessible and removes the need to write it here.
This commit removes this write.
Bug
26115803
Change-Id: Ief72c5f731d3a1231b5080eb531fa0a491a8b1d1
Dimitry Ivanov [Thu, 10 Dec 2015 20:23:34 +0000 (12:23 -0800)]
Merge "Revert "Add /odm/lib to shared lib search path""
am:
cb025e55f7
* commit '
cb025e55f707216eb36b07f6fc36dcf604a45c07':
Revert "Add /odm/lib to shared lib search path"
Dimitry Ivanov [Thu, 10 Dec 2015 20:17:02 +0000 (20:17 +0000)]
Merge "Revert "Add /odm/lib to shared lib search path""
Dimitry Ivanov [Thu, 10 Dec 2015 17:49:42 +0000 (09:49 -0800)]
Merge "constexpr constructor for atfork_list_t" am:
9d8632e1a7
am:
a13d5748a4
* commit '
a13d5748a4dc3ca35ad590844fa231b0f929f2c7':
constexpr constructor for atfork_list_t
Dimitry Ivanov [Thu, 10 Dec 2015 17:45:49 +0000 (09:45 -0800)]
Merge "constexpr constructor for atfork_list_t"
am:
9d8632e1a7
* commit '
9d8632e1a76de6bd6abc853c0fbd6a2c9dc32cdc':
constexpr constructor for atfork_list_t
Dimitry Ivanov [Thu, 10 Dec 2015 17:39:48 +0000 (17:39 +0000)]
Merge "constexpr constructor for atfork_list_t"
Dimitry Ivanov [Thu, 10 Dec 2015 04:41:29 +0000 (04:41 +0000)]
Merge "Add permitted_when_isolated_path to linker namespaces" am:
39801757c3
am:
6e161cc84e
* commit '
6e161cc84efee24b884cf27538ee2980c48c5575':
Add permitted_when_isolated_path to linker namespaces
Dimitry Ivanov [Thu, 10 Dec 2015 04:39:11 +0000 (04:39 +0000)]
Merge "Add permitted_when_isolated_path to linker namespaces"
am:
39801757c3
* commit '
39801757c3bf688bee28f636959757953b2bb695':
Add permitted_when_isolated_path to linker namespaces
Dimitry Ivanov [Thu, 10 Dec 2015 04:34:38 +0000 (04:34 +0000)]
Merge "Add permitted_when_isolated_path to linker namespaces"
Elliott Hughes [Thu, 10 Dec 2015 02:40:50 +0000 (18:40 -0800)]
Merge "Fix -fstack-protector-strong for x86." am:
6500f51c0e
am:
7041f09c18
* commit '
7041f09c18888f22e23c5f43d6222de6883eb689':
Fix -fstack-protector-strong for x86.
Dimitry Ivanov [Thu, 10 Dec 2015 02:40:44 +0000 (18:40 -0800)]
Merge "Revert "Ensure that readlink has access to /proc/self/fd"" am:
5a3ab3422d
am:
55f22b3bb0
* commit '
55f22b3bb0390fffac1bca368fed6b6534a6ba5e':
Revert "Ensure that readlink has access to /proc/self/fd"
Elliott Hughes [Thu, 10 Dec 2015 02:38:25 +0000 (18:38 -0800)]
Merge "Fix -fstack-protector-strong for x86."
am:
6500f51c0e
* commit '
6500f51c0e3ef37dbda889dbd1125c03c787ae50':
Fix -fstack-protector-strong for x86.
Elliott Hughes [Thu, 10 Dec 2015 02:33:34 +0000 (02:33 +0000)]
Merge "Fix -fstack-protector-strong for x86."
Dimitry Ivanov [Wed, 9 Dec 2015 21:57:26 +0000 (21:57 +0000)]
Merge "Revert "Ensure that readlink has access to /proc/self/fd""
am:
5a3ab3422d
* commit '
5a3ab3422d8b8f500eda70edf7b0fff83656603a':
Revert "Ensure that readlink has access to /proc/self/fd"
Dimitry Ivanov [Tue, 8 Dec 2015 18:47:13 +0000 (10:47 -0800)]
Add permitted_when_isolated_path to linker namespaces
The permitted_when_isolated_path is a way to white-list
directories not present in search-path. It is ignored for
not isolated namespaces.
Bug: http://b/
25853516
Bug: http://b/
22548808
Change-Id: Ib1538037268eea69323ea49968a34a4a1d1938a5
Dimitry Ivanov [Wed, 9 Dec 2015 21:50:54 +0000 (21:50 +0000)]
Merge "Revert "Ensure that readlink has access to /proc/self/fd""
Dimitry Ivanov [Wed, 9 Dec 2015 19:36:47 +0000 (19:36 +0000)]
Revert "Ensure that readlink has access to /proc/self/fd"
This reverts commit
4e50d0247b9ace095e371865fad08b1a59672e3a.
Bug: http://b/
24912743
Change-Id: I5d32c670f0e16aec9c74add143158e919a301673
Dimitry Ivanov [Wed, 9 Dec 2015 19:35:02 +0000 (19:35 +0000)]
Revert "Add /odm/lib to shared lib search path"
This reverts commit
f74b041cce75091b922151d4fa57e63c8a6caf4b.
Bug:
25654402
Change-Id: I77386ea3655868d7cd1a8130afbc95e70549389e
Dan Willemsen [Tue, 8 Dec 2015 23:49:51 +0000 (23:49 +0000)]
Merge "libm: Use LOCAL_SRC_FILES_EXCLUDE_{arch}" am:
df196131f3
am:
8fb0f3a4de
* commit '
8fb0f3a4de8b497d6fbbaec2d9b07a8ce4398747':
libm: Use LOCAL_SRC_FILES_EXCLUDE_{arch}
Dan Willemsen [Tue, 8 Dec 2015 23:47:09 +0000 (23:47 +0000)]
Merge "libm: Use LOCAL_SRC_FILES_EXCLUDE_{arch}"
am:
df196131f3
* commit '
df196131f3c16f1eddb1542c7e04c675e7f1fbda':
libm: Use LOCAL_SRC_FILES_EXCLUDE_{arch}
Dan Willemsen [Tue, 8 Dec 2015 23:41:24 +0000 (23:41 +0000)]
Merge "libm: Use LOCAL_SRC_FILES_EXCLUDE_{arch}"
Todd Kjos [Tue, 8 Dec 2015 21:55:07 +0000 (21:55 +0000)]
Merge "bionic: Build Breakage" am:
5736959094
am:
f936e20707
* commit '
f936e2070773624675db9f86a764e29222fba61c':
bionic: Build Breakage
Todd Kjos [Tue, 8 Dec 2015 21:52:17 +0000 (21:52 +0000)]
Merge "bionic: Build Breakage"
am:
5736959094
* commit '
5736959094f7bc80cac5fbfb85c4df499762549a':
bionic: Build Breakage
Todd Kjos [Tue, 8 Dec 2015 21:46:17 +0000 (21:46 +0000)]
Merge "bionic: Build Breakage"
Mark Salyzyn [Tue, 8 Dec 2015 21:42:41 +0000 (13:42 -0800)]
bionic: Build Breakage
Bug:
23668800
Change-Id: Ic7cf5864d3f5881e6f7105a49ecf62b1bc4a604c
Elliott Hughes [Tue, 8 Dec 2015 20:43:13 +0000 (12:43 -0800)]
Fix -fstack-protector-strong for x86.
We need to ensure %gs:20 is set up early enough for -fstack-protector-strong
on x86, and that __set_tls doesn't get stack protector checks because it's a
prerequisite for them. x86 devices/emulators won't boot without this.
Bug: http://b/
26073874
Change-Id: Icf0d34294648cc0c8cb406a3617befe0d45c525a
Dimitry Ivanov [Tue, 8 Dec 2015 19:39:29 +0000 (11:39 -0800)]
constexpr constructor for atfork_list_t
Bug: http://b/
26026986
Change-Id: Iad95383a23f81eea776bebce641c555d26547b77
Mark Salyzyn [Tue, 8 Dec 2015 19:10:04 +0000 (11:10 -0800)]
Merge "Add monotonic logging for bionic" am:
eaccfde075
am:
0bd75ded3a
* commit '
0bd75ded3a35343a63ae2fd22140e323bf038416':
Add monotonic logging for bionic
Mark Salyzyn [Tue, 8 Dec 2015 19:05:48 +0000 (19:05 +0000)]
Merge "Add monotonic logging for bionic"
am:
eaccfde075
* commit '
eaccfde0759c6df6011c2a1e69ca275f2e24d909':
Add monotonic logging for bionic
Mark Salyzyn [Tue, 8 Dec 2015 18:59:05 +0000 (18:59 +0000)]
Merge "Add monotonic logging for bionic"
Elliott Hughes [Tue, 8 Dec 2015 00:03:56 +0000 (00:03 +0000)]
Merge "Base bcopy on memmove rather than memcpy." am:
f0a451dcd1 am:
cf0c1af1dd
am:
73b35f42b7
* commit '
73b35f42b7df3db1e9627989aa86ebcd436ceafe':
Base bcopy on memmove rather than memcpy.
Elliott Hughes [Tue, 8 Dec 2015 00:02:00 +0000 (00:02 +0000)]
Merge "Make all of ndk_cruft.cpp one big extern "C"." am:
9dec0a775b am:
36545d2e76
am:
c94e261348
* commit '
c94e2613487043ae100ca185121702cf77b85aaa':
Make all of ndk_cruft.cpp one big extern "C".
Elliott Hughes [Tue, 8 Dec 2015 00:01:55 +0000 (00:01 +0000)]
Merge "Fix stdio static initializers to make both clang and GCC happy." am:
7bd33cdf15 am:
1190230f33
am:
e122edac1a
* commit '
e122edac1ae04822451842b93cc9ffde017c0182':
Fix stdio static initializers to make both clang and GCC happy.
Elliott Hughes [Mon, 7 Dec 2015 23:59:57 +0000 (23:59 +0000)]
Merge "Revert "Revert "Remove __sinit and __sdidinit.""" am:
c4eef1fb5b am:
568ad51d80
am:
ee13c1562c
* commit '
ee13c1562c333ae79291ba528f1440dbdc62af32':
Revert "Revert "Remove __sinit and __sdidinit.""
Elliott Hughes [Mon, 7 Dec 2015 23:43:15 +0000 (23:43 +0000)]
Merge "Base bcopy on memmove rather than memcpy." am:
f0a451dcd1
am:
cf0c1af1dd
* commit '
cf0c1af1dd2aff82ee13a1d688248b809ef7334b':
Base bcopy on memmove rather than memcpy.
Elliott Hughes [Mon, 7 Dec 2015 23:39:33 +0000 (23:39 +0000)]
Merge "Make all of ndk_cruft.cpp one big extern "C"." am:
9dec0a775b
am:
36545d2e76
* commit '
36545d2e7621d87f68aed620d1c99a9c0f0fbf94':
Make all of ndk_cruft.cpp one big extern "C".
Elliott Hughes [Mon, 7 Dec 2015 23:39:29 +0000 (23:39 +0000)]
Merge "Fix stdio static initializers to make both clang and GCC happy." am:
7bd33cdf15
am:
1190230f33
* commit '
1190230f3316bc26804c60cdd1a859f09c7f11ca':
Fix stdio static initializers to make both clang and GCC happy.
Elliott Hughes [Mon, 7 Dec 2015 23:37:17 +0000 (23:37 +0000)]
Merge "Revert "Revert "Remove __sinit and __sdidinit.""" am:
c4eef1fb5b
am:
568ad51d80
* commit '
568ad51d803228b287a91a307806d1771ed81b7b':
Revert "Revert "Remove __sinit and __sdidinit.""
Elliott Hughes [Mon, 7 Dec 2015 23:20:58 +0000 (23:20 +0000)]
Merge "Base bcopy on memmove rather than memcpy."
am:
f0a451dcd1
* commit '
f0a451dcd10241c8f2ead2448ed922eb80f387f6':
Base bcopy on memmove rather than memcpy.
Elliott Hughes [Mon, 7 Dec 2015 23:16:43 +0000 (23:16 +0000)]
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".
Elliott Hughes [Mon, 7 Dec 2015 23:16:39 +0000 (23:16 +0000)]
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.
Elliott Hughes [Mon, 7 Dec 2015 23:14:29 +0000 (23:14 +0000)]
Merge "Revert "Revert "Remove __sinit and __sdidinit."""
am:
c4eef1fb5b
* commit '
c4eef1fb5ba325317e94b598c6fbf8e4c4bf83e1':
Revert "Revert "Remove __sinit and __sdidinit.""
Elliott Hughes [Mon, 7 Dec 2015 22:07:11 +0000 (22:07 +0000)]
Merge "Base bcopy on memmove rather than memcpy."
Rohit Agrawal [Sat, 5 Dec 2015 20:39:54 +0000 (12:39 -0800)]
Base bcopy on memmove rather than memcpy.
POSIX defined bcopy to handle overlapping memory akin to memmove and
bionic appears to have always done so.
Change-Id: I2599113411e3532913270ba1c1b49e35cbc5f106
Elliott Hughes [Mon, 7 Dec 2015 19:14:46 +0000 (19:14 +0000)]
Merge "Make all of ndk_cruft.cpp one big extern "C"."
Elliott Hughes [Fri, 4 Dec 2015 23:57:51 +0000 (15:57 -0800)]
Make all of ndk_cruft.cpp one big extern "C".
Change-Id: Iddd9b5f36e661e443fa13d12326e72df8c0d209c
Elliott Hughes [Mon, 7 Dec 2015 19:10:32 +0000 (19:10 +0000)]
Merge "Fix stdio static initializers to make both clang and GCC happy."
Elliott Hughes [Mon, 7 Dec 2015 19:07:15 +0000 (11:07 -0800)]
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
Elliott Hughes [Mon, 7 Dec 2015 18:19:07 +0000 (18:19 +0000)]
Merge "Revert "Revert "Remove __sinit and __sdidinit."""
Elliott Hughes [Sat, 5 Dec 2015 02:03:12 +0000 (18:03 -0800)]
Revert "Revert "Remove __sinit and __sdidinit.""
This reverts commit
c8bae05f3ff9f1c736f7be70fa17d02795d748bb.
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
Dimitry Ivanov [Sat, 5 Dec 2015 05:35:14 +0000 (05:35 +0000)]
Merge "Allow dlopening public libs using absolute path" am:
e371ae68ac am:
d5ce2a93af
am:
831fd5e30d
* commit '
831fd5e30d12e344febf11c1d8224a78f76bff8e':
Allow dlopening public libs using absolute path
Dimitry Ivanov [Sat, 5 Dec 2015 05:32:30 +0000 (05:32 +0000)]
Merge "Allow dlopening public libs using absolute path" am:
e371ae68ac
am:
d5ce2a93af
* commit '
d5ce2a93afe7f5cb5b26d2752b84e3376b3c2037':
Allow dlopening public libs using absolute path
Dimitry Ivanov [Sat, 5 Dec 2015 05:29:52 +0000 (05:29 +0000)]
Merge "Allow dlopening public libs using absolute path"
am:
e371ae68ac
* commit '
e371ae68ac0d6d39cacf5edc893bda2f4a61e883':
Allow dlopening public libs using absolute path
Dimitry Ivanov [Sat, 5 Dec 2015 05:25:57 +0000 (05:25 +0000)]
Merge "Allow dlopening public libs using absolute path"
Dimitry Ivanov [Sat, 5 Dec 2015 02:28:49 +0000 (18:28 -0800)]
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
Elliott Hughes [Sat, 5 Dec 2015 02:05:17 +0000 (18:05 -0800)]
Merge "Revert "Remove __sinit and __sdidinit."" am:
0d89913e74 am:
f4e511ecf9
am:
b38fe63b9a
* commit '
b38fe63b9a33c371320e9beb59012a38c8d73a7f':
Revert "Remove __sinit and __sdidinit."
Elliott Hughes [Sat, 5 Dec 2015 02:01:42 +0000 (02:01 +0000)]
Merge "Revert "Remove __sinit and __sdidinit."" am:
0d89913e74
am:
f4e511ecf9
* commit '
f4e511ecf99dab30aeecba4ab1da29a3b89bbbaa':
Revert "Remove __sinit and __sdidinit."
Elliott Hughes [Sat, 5 Dec 2015 01:58:40 +0000 (01:58 +0000)]
Merge "Revert "Remove __sinit and __sdidinit.""
am:
0d89913e74
* commit '
0d89913e74981cd51532e66a2e2f138392be4de1':
Revert "Remove __sinit and __sdidinit."
Elliott Hughes [Sat, 5 Dec 2015 01:53:21 +0000 (01:53 +0000)]
Merge "Revert "Remove __sinit and __sdidinit.""
Elliott Hughes [Sat, 5 Dec 2015 01:47:20 +0000 (17:47 -0800)]
Revert "Remove __sinit and __sdidinit."
This reverts commit
4371961e00ad83fca033992c8a19c7d262fe6f84.
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
Tom Cherry [Sat, 5 Dec 2015 00:35:30 +0000 (00:35 +0000)]
Merge "Do not create prop files for ctl.* properties" am:
4ade5195f1 am:
071234cfd9
am:
2ae9dc726b
* commit '
2ae9dc726b991cf9b4ae2d4ac60a8d5d7a9da75d':
Do not create prop files for ctl.* properties
Tom Cherry [Sat, 5 Dec 2015 00:31:12 +0000 (16:31 -0800)]
Merge "Do not create prop files for ctl.* properties" am:
4ade5195f1
am:
071234cfd9
* commit '
071234cfd9d97c9f7ac640d755e6de900480a846':
Do not create prop files for ctl.* properties
Tom Cherry [Sat, 5 Dec 2015 00:27:56 +0000 (00:27 +0000)]
Merge "Do not create prop files for ctl.* properties"
am:
4ade5195f1
* commit '
4ade5195f188b84ce3599c71ef058d040b141da4':
Do not create prop files for ctl.* properties
Tom Cherry [Sat, 5 Dec 2015 00:21:46 +0000 (00:21 +0000)]
Merge "Do not create prop files for ctl.* properties"
Elliott Hughes [Sat, 5 Dec 2015 00:11:38 +0000 (16:11 -0800)]
Elliott Hughes [Sat, 5 Dec 2015 00:11:32 +0000 (16:11 -0800)]
Merge "Track rename from base/ to android-base/." am:
0b40c13a5a am:
a3f5912129
am:
500cf638df
* commit '
500cf638dfd3b7dbccb00eb174cfd0464d6d36da':
Track rename from base/ to android-base/.
Elliott Hughes [Sat, 5 Dec 2015 00:11:27 +0000 (16:11 -0800)]
Merge "Remove __sinit and __sdidinit." am:
2558b11230 am:
942d81c246
am:
7f4f737552
* commit '
7f4f737552c2f72af107f06a2d2572e8cf4598df':
Remove __sinit and __sdidinit.
Tom Cherry [Sat, 5 Dec 2015 00:11:21 +0000 (16:11 -0800)]
Merge "add checks for initialization for system properties" am:
136bf8fa45 am:
e049fa71cb
am:
1dd18ea8f5
* commit '
1dd18ea8f5a19718da4844f6dcbddf78c1300985':
add checks for initialization for system properties
Yabin Cui [Sat, 5 Dec 2015 00:11:15 +0000 (16:11 -0800)]
Merge "Clear pthread_internal_t allocated on user provided stack." am:
2452cf3c33 am:
21cca02a52
am:
7cb613b6ca
* commit '
7cb613b6cacb0eadd8b68fff92bd857692eb184a':
Clear pthread_internal_t allocated on user provided stack.
Yabin Cui [Sat, 5 Dec 2015 00:11:09 +0000 (16:11 -0800)]
Merge "Don\'t use StringPrintf() in gtest runner." am:
514f46b74c am:
fb3708640f
am:
bced1b67e3
* commit '
bced1b67e3222e1cdcd738c24848dbea976bec78':
Don't use StringPrintf() in gtest runner.
Tom Cherry [Sat, 5 Dec 2015 00:11:03 +0000 (16:11 -0800)]
Merge "Remove c++14\'isms from system_properties" am:
b35a2fb370 am:
e670e2f859
am:
b9692a064c
* commit '
b9692a064c011d49ca875267faefbbd2d12119e7':
Remove c++14'isms from system_properties
Dimitry Ivanov [Sat, 5 Dec 2015 00:10:56 +0000 (16:10 -0800)]
Merge "libm: stop exporting __muldc3" am:
bf20d0226b am:
0ee40ef239
am:
62d36e3f5d
* commit '
62d36e3f5d31dfa94c499a0b8b4e72edbbf2ae62':
libm: stop exporting __muldc3
Elliott Hughes [Sat, 5 Dec 2015 00:06:11 +0000 (16:06 -0800)]
Merge "Fix GCC build." am:
ef2ba3dbf9
am:
70d477c913
* commit '
70d477c913981047235054b6bbb4faa5bfcafb8f':
Fix GCC build.
Elliott Hughes [Sat, 5 Dec 2015 00:02:27 +0000 (16:02 -0800)]
Merge "Fix GCC build."
am:
ef2ba3dbf9
* commit '
ef2ba3dbf986257ded12531fe15bf0d1d4a87d50':
Fix GCC build.
Tom Cherry [Fri, 4 Dec 2015 23:53:25 +0000 (15:53 -0800)]
Do not create prop files for ctl.* properties
Change-Id: Ia6660c68c9e0cb89938751dbc0747ee038394778
Elliott Hughes [Fri, 4 Dec 2015 23:54:15 +0000 (23:54 +0000)]
Merge "Fix GCC build."
Elliott Hughes [Fri, 4 Dec 2015 23:53:25 +0000 (15:53 -0800)]
Fix GCC build.
error: '__sdidinit' initialized and declared 'extern' [-Werror]
Change-Id: I97d9c174da6a99ca61b72572dfb4694813372a60
Elliott Hughes [Fri, 4 Dec 2015 23:37:40 +0000 (23:37 +0000)]
Merge "Track rename from base/ to android-base/." am:
0b40c13a5a
am:
a3f5912129
* commit '
a3f5912129b852196cdcb2b7b0873af723f1bb1f':
Track rename from base/ to android-base/.
Elliott Hughes [Fri, 4 Dec 2015 23:37:34 +0000 (23:37 +0000)]
Merge "Remove __sinit and __sdidinit." am:
2558b11230
am:
942d81c246
* commit '
942d81c246fca0e840fd7917451f67a3ff6a7caa':
Remove __sinit and __sdidinit.
Elliott Hughes [Fri, 4 Dec 2015 23:33:45 +0000 (23:33 +0000)]
Merge "Track rename from base/ to android-base/."
am:
0b40c13a5a
* commit '
0b40c13a5a2da127cb1203d33a3d170671b39247':
Track rename from base/ to android-base/.
Elliott Hughes [Fri, 4 Dec 2015 23:33:39 +0000 (23:33 +0000)]
Merge "Remove __sinit and __sdidinit."
am:
2558b11230
* commit '
2558b112300e0a27590b9e31f627fe94594fa6a0':
Remove __sinit and __sdidinit.
Elliott Hughes [Fri, 4 Dec 2015 23:30:09 +0000 (23:30 +0000)]
Merge "Track rename from base/ to android-base/."
Elliott Hughes [Fri, 4 Dec 2015 23:27:46 +0000 (15:27 -0800)]
Track rename from base/ to android-base/.
Change-Id: I0a4592945400b1fa6892bf7c1fa8659fd711efa3
Elliott Hughes [Fri, 4 Dec 2015 23:27:07 +0000 (23:27 +0000)]
Merge "Remove __sinit and __sdidinit."
Tom Cherry [Fri, 4 Dec 2015 23:14:13 +0000 (23:14 +0000)]
Merge "add checks for initialization for system properties" am:
136bf8fa45
am:
e049fa71cb
* commit '
e049fa71cb918b3b0f0dde5b4c7a650a5b6ee88a':
add checks for initialization for system properties
Tom Cherry [Fri, 4 Dec 2015 23:09:42 +0000 (15:09 -0800)]
Merge "add checks for initialization for system properties"
am:
136bf8fa45
* commit '
136bf8fa45b243b56a8f2543d43970f253118cd7':
add checks for initialization for system properties
Tom Cherry [Fri, 4 Dec 2015 23:06:31 +0000 (23:06 +0000)]
Merge "add checks for initialization for system properties"
Mark Salyzyn [Tue, 1 Dec 2015 00:23:15 +0000 (16:23 -0800)]
Add monotonic logging for bionic
Primarily a debug feature that can be switched at runtime to permit
developer to have the option of high-resolution Android logs with
either CLOCK_REALTIME (default) or CLOCK_MONOTONIC to correlate with
other system activities like kernel logs or systrace.
Bug:
23668800
Change-Id: Ib29024899540f51a72cad5dde25517a7134d68f7
Tom Cherry [Fri, 4 Dec 2015 19:34:42 +0000 (11:34 -0800)]
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
Tom Cherry [Thu, 3 Dec 2015 23:38:52 +0000 (15:38 -0800)]
Remove c++14'isms from system_properties
Change-Id: If78e7d2770e8f8321f0d1824c3c52f93820dd325
Dan Willemsen [Thu, 3 Dec 2015 06:16:48 +0000 (22:16 -0800)]
libm: Use LOCAL_SRC_FILES_EXCLUDE_{arch}
Instead of adding the used common files to each arch that doesn't
override a file, make the architectures list the files they override.
Also updates the Android.bp file to match the Android.mk file.
Change-Id: I7d6a9c2e1c6b6cc9430aa818a89a2ccf52f62c98
Yabin Cui [Fri, 4 Dec 2015 00:28:03 +0000 (16:28 -0800)]
Don't use StringPrintf() in gtest runner.
Change-Id: I0cd0b3cbb952c65b1c449e88ce12964b93029538
Yabin Cui [Fri, 4 Dec 2015 01:09:36 +0000 (01:09 +0000)]
Merge "Clear pthread_internal_t allocated on user provided stack." am:
2452cf3c33
am:
21cca02a52
* commit '
21cca02a52e76c8a76ddf841bc447de9f650c4f0':
Clear pthread_internal_t allocated on user provided stack.
Yabin Cui [Fri, 4 Dec 2015 01:05:37 +0000 (01:05 +0000)]
Merge "Clear pthread_internal_t allocated on user provided stack."
am:
2452cf3c33
* commit '
2452cf3c332fdfdae6b6b27b57acaa6786a91c87':
Clear pthread_internal_t allocated on user provided stack.
Yabin Cui [Fri, 4 Dec 2015 00:58:05 +0000 (00:58 +0000)]
Merge "Clear pthread_internal_t allocated on user provided stack."
Yabin Cui [Thu, 3 Dec 2015 21:01:42 +0000 (13:01 -0800)]
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