summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove libstdc++ dependency from host libbacktrace"Dan Albert2014-05-221-0/+3
|\
| * Remove libstdc++ dependency from host libbacktraceDan Albert2014-05-211-0/+3
| | | | | | | | | | | | | | The libc++ version of libbacktrace on the host was still linking against libstdc++, and this was causing problems in art. Change-Id: I1d14fb9e18abd074affcf46c8044407041970669
* | Merge "Remove unnecessary #includes of <sys/atomics.h>."Elliott Hughes2014-05-222-3/+0
|\ \
| * | Remove unnecessary #includes of <sys/atomics.h>.Elliott Hughes2014-05-222-3/+0
| | | | | | | | | | | | | | | Bug: 14903517 Change-Id: I5b0a418dd982f1a2fd90609b12bd8364f7f34996
* | | Merge "libsync: Turn on -Werror"Mark Salyzyn2014-05-221-0/+2
|\ \ \ | |/ / |/| |
| * | libsync: Turn on -WerrorMark Salyzyn2014-05-211-0/+2
| | | | | | | | | | | | Change-Id: Ie34f935694034a069e844be64d6011eb9e3f9869
* | | Merge "Judge mmap failed by MAP_FAILED instead of NULL"Elliott Hughes2014-05-222-2/+2
|\ \ \
| * | | Judge mmap failed by MAP_FAILED instead of NULLHurri Lu2014-05-222-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I74422cfdba341fcd1a6235044700cf3986e853d0 Signed-off-by: Hurri Lu <jlu32@marvell.com>
* | | | Merge "Move libutils from fdprintf to POSIX dprintf."Calin Juravle2014-05-221-5/+1
|\ \ \ \
| * | | | Move libutils from fdprintf to POSIX dprintf.Elliott Hughes2014-05-221-5/+1
|/ / / / | | | | | | | | | | | | | | | | Bug: 11156955 Change-Id: I70a75c07744d9897d76b180e4940b8717297c53f
* | | | Merge "Add missing headers"Dan Albert2014-05-222-0/+2
|\ \ \ \
| * | | | Add missing headersDan Albert2014-05-212-0/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | These headers are needed for pid_t and free when using libc++ headers (POSIX does not require that the symbols be exposed with the previous includes). Change-Id: Ia51a4fdfdbae7377130a43c401c2d8d241671d1e
* | | | Merge "Fix register dump and back trace after a crash."Elliott Hughes2014-05-211-2/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Fix register dump and back trace after a crash.Douglas Leung2014-05-211-2/+14
|/ / / | | | | | | | | | | | | Change-Id: Ie5f6624b9dcf81d84769b9cdaf9d8a301c8826f7 Signed-off-by: Douglas Leung <douglas@mips.com>
* | | Merge "Revert "libnetutils: Turn on -Werror""Mark Salyzyn2014-05-211-5/+3
|\ \ \
| * | | Revert "libnetutils: Turn on -Werror"Mark Salyzyn2014-05-211-5/+3
| | |/ | |/| | | | | | | | | | | | | This reverts commit 249c26de823be0f9a84a9f092c776bcd9830fba5. Change-Id: I2a56c574fa8d842d5f3c51fd57ecf078838fcfec
* | | Merge "libnetutils: Turn on -Werror"Mark Salyzyn2014-05-211-3/+5
|\ \ \ | |/ /
| * | libnetutils: Turn on -WerrorMark Salyzyn2014-05-211-3/+5
| | | | | | | | | | | | Change-Id: Ie6754f41f9348852a02cc0ff35befb5a76ac2882
* | | Merge "libdiskconfig: Turn on -Werror"Mark Salyzyn2014-05-211-0/+1
|\ \ \ | |/ /
| * | libdiskconfig: Turn on -WerrorMark Salyzyn2014-05-211-0/+1
|/ / | | | | | | Change-Id: Ic0f5871bd434fda78df79b1417f7bc610d99f73e
* | Merge "Modify VID for Compal"Colin Cross2014-05-211-1/+4
|\ \
| * | Modify VID for Compalherman_lin2014-05-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original definition of VENDOR_ID_COMPAL is for Compal Communications, Inc. But Compal Communications, Inc(CCI) had been merged into Compal Electronics, Inc(CEI) at April of 2014 So VENDOR_ID_COMPAL should be changed from 0x1219(CCI's VID) to 0x04B7(CEI's VID). And add one new definition(VENDOR_ID_COMPALCOMM) for CCI to maintain old devices that use CCI's VID. modified: adb/usb_vendors.c Change-Id: I9e9a96f6cc81273ff2c9353a13e7ce3b0583396b
* | | Merge "toolbox: fix x86 build"Greg Hackmann2014-05-211-2/+2
|\ \ \
| * | | toolbox: fix x86 buildGreg Hackmann2014-05-211-2/+2
|/ / / | | | | | | | | | | | | Change-Id: Iadedae749b31adb1310fa50a68b2dc19097c3654 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | Merge "toolbox: fix build"Greg Hackmann2014-05-212-3/+3
|\ \ \ | |_|/ |/| |
| * | toolbox: fix buildGreg Hackmann2014-05-212-3/+3
| | | | | | | | | | | | | | | Change-Id: I4d37ae4ad19620f77e37b739fb1248b712b3f986 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | Merge "Move netd_client into netd."Sreeram Ramachandran2014-05-215-269/+0
|\ \ \ | |/ / |/| |
| * | Move netd_client into netd.Sreeram Ramachandran2014-05-215-269/+0
|/ / | | | | | | | | | | (cherry picked from commit f1b21c5c735e9150c8f29bdb52db2f3eb3ffc469) Change-Id: Ie4b6b303225c93f2448a503d6ea9cebb552cbad5
* | Merge "toolbox: turn on -Werror"Mark Salyzyn2014-05-2127-84/+58
|\ \
| * | toolbox: turn on -WerrorMark Salyzyn2014-05-1427-84/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Deal with some signedness issues - Deal with some size issues - Deal with NULL pointer issues - Deal with some -Wunused issues Change-Id: I1479dd90d690084491bae3475f2c547833519a57
* | | Merge "Fix win32 undefined reference to `_socket_network_client_timeout'."Elliott Hughes2014-05-203-18/+16
|\ \ \
| * | | Fix win32 undefined reference to `_socket_network_client_timeout'.Elliott Hughes2014-05-203-18/+16
|/ / / | | | | | | | | | Change-Id: I063213957b8452f4690da0f64872075f7c27b4cd
* | | Merge "Address additional warnings found by GCC 4.9."Ben Cheng2014-05-201-1/+1
|\ \ \
| * | | Address additional warnings found by GCC 4.9.Ben Cheng2014-05-201-1/+1
|/ / / | | | | | | | | | Change-Id: I8aae6c3e1ccc2294f4db455e1b4f3b4c34a00aaf
* | | Merge "Fix win32 implicit declaration of function ↵Elliott Hughes2014-05-201-0/+2
|\ \ \ | | | | | | | | | | | | socket_network_client_timeout."
| * | | Fix win32 implicit declaration of function socket_network_client_timeout.Elliott Hughes2014-05-201-0/+2
|/ / / | | | | | | | | | Change-Id: Ic6070855a21920384c555c9c82b9a2e4a776cbae
* | | Merge "Fix Windows socket_network_client.c build failures."Elliott Hughes2014-05-191-1/+8
|\ \ \
| * | | Fix Windows socket_network_client.c build failures.Elliott Hughes2014-05-191-1/+8
|/ / / | | | | | | | | | Change-Id: Ie67a2305ade02e078bf0edf54104c295b091b1b7
* | | Merge "Bound the ADB connect time with a non-blocking connect"Elliott Hughes2014-05-193-6/+75
|\ \ \
| * | | Bound the ADB connect time with a non-blocking connectKen Lierman2014-05-193-6/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a disconnect, the initial blocking connect takes a long time to return, while subsequent calls return quicks. Switch to a non-blocking connect to make the re-connect time more consistent and faster overall. Change-Id: I21d02b22a8eb9a457c2f1fa95eb17894d5612ccd Signed-off-by: Ken Lierman <ken.lierman@windriver.com> Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com> Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com> Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
* | | | Merge "Really fixes the ub branches"Dan Albert2014-05-191-1/+1
|\ \ \ \
| * | | | Really fixes the ub branchesDan Albert2014-05-191-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: I1d78f4e6c1d8086c2895f6739c3202e9ef74fee2
* | | | Merge "Fix unbundled branches"Dan Albert2014-05-191-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Fix unbundled branchesDan Albert2014-05-191-0/+3
|/ / / | | | | | | | | | Change-Id: Ic8a58a6cf55221ec361bbb80c7c9636fe1349943
* | | Merge "Adds libc++ versions of libbacktrace"Dan Albert2014-05-192-1/+46
|\ \ \
| * | | Adds libc++ versions of libbacktraceDan Albert2014-05-192-1/+46
|/ / / | | | | | | | | | Change-Id: I4a1ce30e7c2166ac1846cc90de0252beee542ee6
* | | Merge "Teach debuggerd the name of SIGTRAP."Elliott Hughes2014-05-172-13/+12
|\ \ \
| * | | Teach debuggerd the name of SIGTRAP.Elliott Hughes2014-05-162-13/+12
|/ / / | | | | | | | | | | | | | | | | | | Also add SIGTRAP to the list of signals we don't want to double fault on. Bug: 15024256 Change-Id: I23ab80800563c007fcd3e42527329fedf762f0c8
* | | Merge "Remove the broken LED flashing code from debuggerd."Elliott Hughes2014-05-171-63/+2
|\ \ \
| * | | Remove the broken LED flashing code from debuggerd.Elliott Hughes2014-05-161-63/+2
|/ / / | | | | | | | | | Change-Id: I4d0cbe14daa90ac5f91ce4597584448ee3c65dda
generated by cgit v1.1 at 2025-05-03 23:46:32 +0000