Commit graph

35400 commits

Author SHA1 Message Date
Elliott Hughes
df5ecefde4 Merge "Fix reference to out of scope local in adb_thread_setname." am: b31ca1a64f am: 15d565bbca
am: b664dd38b9

Change-Id: Id2d91a34d11400cdb4b601da745d64209aeb3e71
2017-08-03 00:25:00 +00:00
Elliott Hughes
b664dd38b9 Merge "Fix reference to out of scope local in adb_thread_setname." am: b31ca1a64f
am: 15d565bbca

Change-Id: Ibb3694aa20648a1313b8e9de9a2f56628b863365
2017-08-03 00:19:33 +00:00
Elliott Hughes
15d565bbca Merge "Fix reference to out of scope local in adb_thread_setname."
am: b31ca1a64f

Change-Id: Idc5b3208b7868a2636b7c335c48db57dd48e8b83
2017-08-03 00:15:37 +00:00
Josh Gao
fb3d04b440 Merge "Revert "base: work around thread safety analysis bug."" am: b5c90e9d6b am: 9560524455
am: 9e4fb9a117

Change-Id: Id5e5cee1294ae947bc2b9d1ce8d210c595b068cd
2017-08-03 00:09:50 +00:00
Josh Gao
9e4fb9a117 Merge "Revert "base: work around thread safety analysis bug."" am: b5c90e9d6b
am: 9560524455

Change-Id: I37dc94c066c1527c10488e48c713c29b4e211cfb
2017-08-02 23:59:32 +00:00
Treehugger Robot
b31ca1a64f Merge "Fix reference to out of scope local in adb_thread_setname." 2017-08-02 23:57:57 +00:00
Josh Gao
9560524455 Merge "Revert "base: work around thread safety analysis bug.""
am: b5c90e9d6b

Change-Id: Ieda68e652c9784990dd7d03c4101b5a9ed18d98a
2017-08-02 23:32:58 +00:00
Josh Gao
6db08e9e1f Merge "base: work around thread safety analysis bug." am: f3c7f10abd am: f727a3933e
am: 14c7e22a50

Change-Id: I8f9c6e581ad967280dd44cabdd0aa31866e1ace9
2017-08-02 23:30:27 +00:00
Elliott Hughes
78bc132d32 Merge "Make sure freeaddrinfo is always called on failure." am: f914029057 am: 9e1173aa40
am: 84cd98ceb0

Change-Id: I3d36bf694b20cf423cf1b3b5f647f7e907f20703
2017-08-02 23:28:54 +00:00
George Burgess IV
060bb6038b Merge "libappfuse: use an explicit buffer size" am: ac8a484646 am: 7aa81fcdad
am: 864008e980

Change-Id: I72ee9e23ff25ca2d973bc18be0f4a256e80e2126
2017-08-02 23:27:56 +00:00
Josh Gao
14c7e22a50 Merge "base: work around thread safety analysis bug." am: f3c7f10abd
am: f727a3933e

Change-Id: Idec1b1d5e43745b6db43fa9f4ad0ad9c639b58e6
2017-08-02 23:25:26 +00:00
Elliott Hughes
84cd98ceb0 Merge "Make sure freeaddrinfo is always called on failure." am: f914029057
am: 9e1173aa40

Change-Id: Ib7936a9034467c38a58b5066472cdd5187a0e1b2
2017-08-02 23:22:36 +00:00
George Burgess IV
864008e980 Merge "libappfuse: use an explicit buffer size" am: ac8a484646
am: 7aa81fcdad

Change-Id: I5e7cc82070404346f462e2b44e6c6e6410a6cae9
2017-08-02 23:19:03 +00:00
Josh Gao
f727a3933e Merge "base: work around thread safety analysis bug."
am: f3c7f10abd

Change-Id: Ied41fa3a6724c7835ce8636301e1e30c23e1d660
2017-08-02 23:16:29 +00:00
Elliott Hughes
9e1173aa40 Merge "Make sure freeaddrinfo is always called on failure."
am: f914029057

Change-Id: Iff3b186c35bca1f1c7292f5e5567d3ce11037239
2017-08-02 23:10:59 +00:00
Josh Gao
b5c90e9d6b Merge "Revert "base: work around thread safety analysis bug."" 2017-08-02 23:10:42 +00:00
Josh Gao
c54e3dba8d Revert "base: work around thread safety analysis bug."
This reverts commit e4509da961.

Reason for revert: probably breaks checkbuild?

Change-Id: I04a6284dee82761c90fa355da0472855a228b849
2017-08-02 23:10:26 +00:00
George Burgess IV
7aa81fcdad Merge "libappfuse: use an explicit buffer size"
am: ac8a484646

Change-Id: Iaddc175350cd1980c9ee446dcdec198318c960d3
2017-08-02 23:10:02 +00:00
Josh Gao
f3c7f10abd Merge "base: work around thread safety analysis bug." 2017-08-02 23:09:07 +00:00
Treehugger Robot
f914029057 Merge "Make sure freeaddrinfo is always called on failure." 2017-08-02 23:00:23 +00:00
Treehugger Robot
ac8a484646 Merge "libappfuse: use an explicit buffer size" 2017-08-02 22:57:27 +00:00
Josh Gao
e4509da961 base: work around thread safety analysis bug.
Clang's assert_capability and assert_shared_capability annotations are
nonfunctional until https://reviews.llvm.org/rL309725 is relanded and
makes its way into our toolchain. Work around this by using the
equivalent assert_lock and assert_shared_lock.

Bug: http://b/64226736
Test: manual
Change-Id: I40711f162ea1d492f1e0b3eff88bf6ae6d995e2f
2017-08-02 14:44:58 -07:00
George Burgess IV
87533581be libappfuse: use an explicit buffer size
This patch makes lookup_name use an explicit buffer size, rather than
"whatever the union happens to give me." I don't know if it's the
correct size, but having a 0-length array in this sort of configuration
seems fragile, and will be a compilation error when
https://android-review.googlesource.com/#/c/platform/bionic/+/449363/
goes in.

Bug: 12231437
Test: Builds with the mentioned patch applied to Bionic
Change-Id: I5793c906b7c2417e9a58aa907ef11c282027edb2
2017-08-02 14:11:25 -07:00
Steven Moreland
c6ecd7770e Merge "Remove TODOs for std::string removal." am: ceb7814c86 am: 7170d5bf24
am: 3db7ef0168

Change-Id: I527fa18f23bea5464481227bb35ec493be7eb199
2017-08-02 20:59:47 +00:00
Steven Moreland
3db7ef0168 Merge "Remove TODOs for std::string removal." am: ceb7814c86
am: 7170d5bf24

Change-Id: Ibb86fe114ddd5b20bb343018f90775d90e66ad38
2017-08-02 20:54:46 +00:00
Steven Moreland
7170d5bf24 Merge "Remove TODOs for std::string removal."
am: ceb7814c86

Change-Id: Iab64291aec5edd44ebf8856fb2d24c6d0e779bed
2017-08-02 20:49:46 +00:00
Treehugger Robot
ceb7814c86 Merge "Remove TODOs for std::string removal." 2017-08-02 20:35:45 +00:00
Elliott Hughes
7462f1858c Fix reference to out of scope local in adb_thread_setname.
Bug: https://android-review.googlesource.com/#/c/168725/5/adb/sysdeps.h@639
Test: boots, adbd thread names look sane
Signed-off-by: Ivan Maidanski <i.maidanski@samsung.com>
Change-Id: Ib3bdf53658f3903de8f0a5688f7d77745e677c77
2017-08-02 20:34:06 +00:00
Elliott Hughes
3ff453aaa0 Make sure freeaddrinfo is always called on failure.
Bug: https://android-review.googlesource.com/#/c/platform/system/core/+/268797/2/libcutils/socket_network_client_unix.c
Test: builds
Signed-off-by: Ivan Maidanski <i.maidanski@samsung.com>
Change-Id: I2d93c8359c3398769d408284f77d56e09713a7f3
2017-08-02 20:32:27 +00:00
Elliott Hughes
54f2e52ab5 Merge "Add comments to "public.libraries.*.txt"." am: e7b8fc22af am: 601e5ac55b
am: 3cdb21a8c7

Change-Id: I049c98243b522b8c3fcb64d917ff64a1e6d576c0
2017-08-02 19:52:26 +00:00
Christopher Ferris
86ee45499d Merge "Allow mips to build." am: 7009a3ccf7 am: 3b6bbb8178
am: fa700068f8

Change-Id: I9a3e85f2223d6b6e520056fb156b9158a277d41e
2017-08-02 19:52:08 +00:00
Elliott Hughes
3cdb21a8c7 Merge "Add comments to "public.libraries.*.txt"." am: e7b8fc22af
am: 601e5ac55b

Change-Id: I17f4d394ba671463d195a8a785a96c3b4502e1da
2017-08-02 19:48:46 +00:00
Christopher Ferris
fa700068f8 Merge "Allow mips to build." am: 7009a3ccf7
am: 3b6bbb8178

Change-Id: Ia29af9266e7bccb8865756ab974f7c591daca825
2017-08-02 19:47:44 +00:00
Elliott Hughes
601e5ac55b Merge "Add comments to "public.libraries.*.txt"."
am: e7b8fc22af

Change-Id: I8519a128238758433d194f35f6090633aeb85f0a
2017-08-02 19:43:01 +00:00
Christopher Ferris
3b6bbb8178 Merge "Allow mips to build."
am: 7009a3ccf7

Change-Id: I4564b2298e16258ccfe49f6651b751af35139f5f
2017-08-02 19:42:41 +00:00
Treehugger Robot
e7b8fc22af Merge "Add comments to "public.libraries.*.txt"." 2017-08-02 19:34:26 +00:00
Christopher Ferris
7009a3ccf7 Merge "Allow mips to build." 2017-08-02 19:30:16 +00:00
Christopher Ferris
32766f1f52 Allow mips to build.
Test: Build mips.
Change-Id: Ice2fe1d11b7c628b325ea2ad1fd1252ad8e10668
2017-08-02 10:45:46 -07:00
Tom Cherry
99a538a4bb Merge "init: use unique_fd in builtins.cpp" am: c34afb1cd5 am: 76756aa1dd
am: 54032d387a

Change-Id: I20865544dd1692979c8fbd21c05272a98c00eca4
2017-08-02 17:27:03 +00:00
Tom Cherry
54032d387a Merge "init: use unique_fd in builtins.cpp" am: c34afb1cd5
am: 76756aa1dd

Change-Id: Idbb7f13966643faa2e38ac954e21d6af2daed4f5
2017-08-02 17:22:30 +00:00
Tom Cherry
76756aa1dd Merge "init: use unique_fd in builtins.cpp"
am: c34afb1cd5

Change-Id: I9f1fef77ab4d3f873180f305177e586d44a22c49
2017-08-02 17:18:33 +00:00
Tom Cherry
c34afb1cd5 Merge "init: use unique_fd in builtins.cpp" 2017-08-02 17:09:31 +00:00
Christopher Ferris
aaea04cf0d Merge "Revert "Add support for the new unwind method."" am: 0d2cac9ea8 am: ce7c7c04d9
am: b736134dc9

Change-Id: I7369d1089ff5734bb69ad8add610c0790b797e7b
2017-08-02 02:18:37 +00:00
Christopher Ferris
b736134dc9 Merge "Revert "Add support for the new unwind method."" am: 0d2cac9ea8
am: ce7c7c04d9

Change-Id: Ia61d452721e9ec76823cf766a738f53ccd9b2c37
2017-08-02 02:14:35 +00:00
Christopher Ferris
ce7c7c04d9 Merge "Revert "Add support for the new unwind method.""
am: 0d2cac9ea8

Change-Id: I68903c1641ee0d439dc5f839b968cff4b739dd84
2017-08-02 02:06:06 +00:00
Christopher Ferris
0d2cac9ea8 Merge "Revert "Add support for the new unwind method."" 2017-08-02 01:49:03 +00:00
Christopher Ferris
bd625efbca Revert "Add support for the new unwind method."
This reverts commit 5b460d13a4.

Reason for revert: Strange sailfish boot problem.

Change-Id: Ibde9375405cca4343c262335647dac120aab4d73
2017-08-02 01:47:31 +00:00
Christopher Ferris
0a063d5736 Merge "Add support for the new unwind method." am: 9ccf627e78 am: 61ef596862
am: 8216b64545

Change-Id: I586fa7b51c6ee6d86d2c8f39eaed01e5e49cff43
2017-08-01 23:37:55 +00:00
Christopher Ferris
8216b64545 Merge "Add support for the new unwind method." am: 9ccf627e78
am: 61ef596862

Change-Id: Ia13d7a19837313eccabb7c0fd84eebb5a7ae5236
2017-08-01 23:34:26 +00:00
Chih-Hung Hsieh
c3357de3fd Merge "Fix misc-macro-parentheses warnings in system/core." am: e4bd153e55 am: dfaa20c069
am: 3d0ff4ee98

Change-Id: Id161056885d346583e66ca49bf10934bc01e619f
2017-08-01 23:34:26 +00:00