Commit Graph

11462 Commits

Author SHA1 Message Date
Narayan Kamath f1ac6917da Merge "Remove loghack.h." 2015-02-21 09:51:18 +00:00
Narayan Kamath 453a332812 Remove loghack.h.
This was supposedly used to enable logging when !HAVE_ANDROID_OS
but it's only used in a file that's target specific.

Change-Id: Id83f2597e48a66b4821fc3b1237e212872b909fb
2015-02-21 09:46:31 +00:00
Narayan Kamath 1158c7d5fe Merge "Remove reference to NOT_USING_KLIBC and cygwin." 2015-02-20 16:40:33 +00:00
Andreas Gampe 623eebe68f Merge "Libcutils: Remove unused variable" 2015-02-20 00:57:33 +00:00
Andreas Gampe 7f71a45a17 Libcutils: Remove unused variable
Change-Id: I95eed017e78468c4946b2a5b62b6fe92e256673e
2015-02-19 16:54:32 -08:00
Dan Albert 7e84308b74 Merge "Lose adb.c and sockets.c to libadb." 2015-02-19 23:47:18 +00:00
Dan Albert e1ca623faa Lose adb.c and sockets.c to libadb.
Also kill the device side libadb. This was added for the now dead
device side adb, and is no longer used.

Bug: 17626262
Change-Id: I3b28915641fd5b4f16fc86cf1f4f4e9711093001
2015-02-19 13:49:35 -08:00
Dan Albert 18daa159ec Merge "Document the behavior of props affecting adb root." 2015-02-19 20:33:31 +00:00
Dan Albert 13f9c406d7 Document the behavior of props affecting adb root.
Change-Id: Icfdc3ba696556d6db64835e61dde6f40b491d1a7
2015-02-19 12:29:01 -08:00
Dan Albert 63feeaaa06 Merge "Fix Windows adb build." 2015-02-19 19:37:24 +00:00
Dan Albert 6795cd8db5 Fix Windows adb build.
Change-Id: I560bedfcf77556b36acadc19f5dac71b3628ea2b
2015-02-19 11:36:53 -08:00
Dan Albert 9a525d7f2e Merge "Move adb_main to its own file." 2015-02-19 18:44:17 +00:00
Dan Albert 915d2e98eb Merge "Move the listener code into its own file." 2015-02-19 18:44:11 +00:00
Dan Albert e1f2080f67 Merge "Move the adb auth code into its own file." 2015-02-19 18:44:04 +00:00
Narayan Kamath 5955a9f5e4 Remove reference to NOT_USING_KLIBC and cygwin.
The reference to NOT_USING_KLIBC appears to be the only one
in our codebase. This change also removes some cygwin specific
retry logic - all other supported platforms in this section
of the code should support mapping at an offset.

Note that i've reversed the sense of the check, we always sysconf
since that's recommended practice.

Change-Id: Ib985fb665193d7a07a282f7092cd77c0bc508a66
2015-02-19 18:36:27 +00:00
Dan Albert bd0b750897 Move adb_main to its own file.
Change-Id: If6e98c089b39f73bd8f4a878a82669bfeee367f3
2015-02-18 18:32:54 -08:00
Dan Albert e9fca14c9e Move the listener code into its own file.
Change-Id: I7332455ed1a213daedeaa4a81260edf08b2fd131
2015-02-18 18:22:52 -08:00
Dan Albert ba3a251749 Move the adb auth code into its own file.
Change-Id: I84cf0bd7777f0147119e7c6afc4096c2e93156a2
2015-02-18 18:22:52 -08:00
Dan Albert 1403aa36b2 Merge "Move emulator tracing into its own file." 2015-02-19 02:10:10 +00:00
Dan Albert 21c3eaf4cc Move emulator tracing into its own file.
adb.c is far too monolithic.

Change-Id: I4a9ee97927e4a96a38ea5859d84efac86bfdfc35
2015-02-18 17:21:17 -08:00
Elliott Hughes 1af18c3c98 Merge "Fix build." 2015-02-19 00:59:36 +00:00
Elliott Hughes 4c9d24a3ed Fix build.
Change-Id: I31fc562068ebbba5e9872ee91694feb611fc957f
2015-02-18 16:57:30 -08:00
Elliott Hughes 8e16a7e2a3 Merge "adb: add "adb unroot" to restart adb in non-root mode" 2015-02-19 00:18:38 +00:00
Dan Albert 2268788ae4 Merge "Move USB transport code to libadb." 2015-02-18 23:42:42 +00:00
Dan Pasanen 9885881d06 adb: add "adb unroot" to restart adb in non-root mode
Change-Id: Ice6b94a71a62648ac073d129914a07372411fb25
2015-02-18 12:37:11 -08:00
Yabin Cui b703214e25 Merge "Move sprintf to snprintf." 2015-02-18 20:26:02 +00:00
Dan Albert 9449376328 Move USB transport code to libadb.
Also note that we need both a libadb and a libadbd (for now) to
differentiate between code using ADB_HOST=1 and ADB_HOST=0.

Bug: 17626262
Change-Id: I873a8fb442a8a69258fe39af17781714a8fae4f6
2015-02-18 10:55:28 -08:00
Dan Albert 1ac334ec66 Merge "Add extern "C" to all the adb headers." 2015-02-18 17:52:40 +00:00
Dan Albert 32e872caa4 Merge "Ignore useless cpplint messages in adb." 2015-02-18 17:45:26 +00:00
Dan Albert 818fb4b448 Add extern "C" to all the adb headers.
Change-Id: Iaefa3e18d6ee2e065eb97271a796613b2a8e7d6e
2015-02-18 00:21:16 -08:00
Dan Albert 54ac73aa34 Ignore useless cpplint messages in adb.
Change-Id: I6411eb3963d215b228e50cd967a2174e5036ed73
2015-02-18 00:20:37 -08:00
Yabin Cui e2d63af002 Move sprintf to snprintf.
Bug: 19340053
Change-Id: Id0d866e6195ed4752b4be6081eeb2aab8b1dbe9a
2015-02-17 19:27:51 -08:00
Elliott Hughes f96c15000f Merge "Fix the WriteStringToFile overload that takes mode/owner/group." 2015-02-17 18:47:01 +00:00
Elliott Hughes 9d1f515ed1 Fix the WriteStringToFile overload that takes mode/owner/group.
The actual bug is == instead of !=, but the real cause was me trying to be
too clever. This patch switches to much simpler code, and -- since the
intended use of this code is security anyway -- adds logging if anything
goes wrong.

Bug: 19361774
Change-Id: If2af07d31a5002f9010b838247b691f6b28bdfb1
2015-02-17 10:25:23 -08:00
Elliott Hughes 29576ae890 Merge "/vendor is sometimes on a separate partition now." 2015-02-14 04:56:22 +00:00
Elliott Hughes 3a5d71ac60 /vendor is sometimes on a separate partition now.
Change-Id: I3217c272ea38ab8212056e0432d0ededacd362f6
2015-02-13 16:59:00 -08:00
Elliott Hughes b0572e2566 Merge "Remove unused variable BOOTCHART_DEFAULT_TIME_SEC." 2015-02-14 00:18:16 +00:00
Elliott Hughes 0f58cb0035 Remove unused variable BOOTCHART_DEFAULT_TIME_SEC.
Change-Id: Id43c73dd32d2f9f1eee9592b55aa3fd3c02094b2
2015-02-13 16:17:42 -08:00
Elliott Hughes bf7560f12c Merge "Further refactoring of the bootchart code." 2015-02-13 23:54:29 +00:00
Elliott Hughes 841b263fae Further refactoring of the bootchart code.
Change-Id: Ifed6ae8d481b605139fd27799574de4c2d0f5908
2015-02-13 15:15:11 -08:00
Elliott Hughes 265df6f50c Merge "bootchart: fix bootchart can not be triggered problem" 2015-02-12 20:17:50 +00:00
Yongqin Liu a197ff12dd bootchart: fix bootchart can not be triggered problem
bootchart uses a file on the data partition to decide if it should collect
data for bootchart, but the data partition will be mounted by the mount_all
command in the "on fs" section, and it will be only added into the action
queue when command "trigger fs" is executed, but that's after the
bootchart_init action (late_init).

This change makes bootchart_init a builtin command of init,
and make it executed as the first command of "on post-fs" section
which will be triggered after the "on fs" section.

This change also refactors the bootchart code to all be in bootchart.cpp.

Change-Id: Ia74aa34ca5b785f51fcffdd383075a549b2a99d9
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2015-02-12 12:13:24 -08:00
Christopher Ferris 884f194255 Merge "Do not dump maps/memory/code of sibling threads." 2015-02-11 01:19:56 +00:00
Mark Salyzyn 05a67c964b Merge "liblog: test: ARM64: Enable 32 and 64-bit liblog_benchmark" 2015-02-10 18:16:05 +00:00
Mark Salyzyn 53016d8949 liblog: test: ARM64: Enable 32 and 64-bit liblog_benchmark
- Enable build for 32 and 64 bit benchmark executables
- Fix some cosmetics issues in logd_write.c

Change-Id: I544446e5116607d7fec89171135f6e1eff6aebd8
2015-02-10 18:15:51 +00:00
Narayan Kamath 0d385d1c62 Merge "Track renaming of initUnchangeableSystemProperty." 2015-02-10 15:43:54 +00:00
Narayan Kamath 484c55b37f Track renaming of initUnchangeableSystemProperty.
It's now setUnchangeableSystemProperty.

Change-Id: Ib42f8ac9f074230dfb7af2eb633e0a536ab7d4b7
2015-02-10 15:43:41 +00:00
Christopher Ferris ab9e7dcef6 Do not dump maps/memory/code of sibling threads.
Modifies the code so that if the unwind fails, the code still prints
as much data as possible.

Also, for sibling threads, skip printing the maps and memory/code
since it's not likely to be very relevant.

Fix a few cases where extra space is at the end of lines.

Fix an inverted if statement that was checking the wrong condition.

Bug: 18816322
Change-Id: Ic659e0c34489bf2c65c5a23e2b83e31653b927e4
2015-02-09 19:22:33 -08:00
Andreas Gampe ed318bff41 Merge "log.h: Fix typo" 2015-02-10 00:17:42 +00:00
Andreas Gampe f45bbe496f log.h: Fix typo
Change-Id: I6b5e9bc9d40e5e5ecf9f50f7392675391e6f18e6
2015-02-09 16:13:33 -08:00