Colin Cross
47de006075
am bd514144
: am 47770b73
: Merge "debuggerd: use LOCAL_MULTILIB"
...
* commit 'bd514144ad5254e4e2c08e17affe6e178bb49074':
debuggerd: use LOCAL_MULTILIB
2014-03-27 18:20:03 +00:00
Colin Cross
bd514144ad
am 47770b73
: Merge "debuggerd: use LOCAL_MULTILIB"
...
* commit '47770b7396186d6700688fd039320283e5b68501':
debuggerd: use LOCAL_MULTILIB
2014-03-27 18:13:16 +00:00
Colin Cross
47770b7396
Merge "debuggerd: use LOCAL_MULTILIB"
2014-03-27 18:09:04 +00:00
Mark Salyzyn
509b198388
am a43bb3a4
: am e644664f
: Merge "liblog: deal with restart of logd"
...
* commit 'a43bb3a4d0093a45a3203c3511257116f6029f49':
liblog: deal with restart of logd
2014-03-27 00:10:38 +00:00
Mark Salyzyn
a43bb3a4d0
am e644664f
: Merge "liblog: deal with restart of logd"
...
* commit 'e644664f1cbc4add3cc56981bab007380859853a':
liblog: deal with restart of logd
2014-03-26 23:59:24 +00:00
Mark Salyzyn
e644664f1c
Merge "liblog: deal with restart of logd"
2014-03-26 23:24:22 +00:00
Colin Cross
87a6b1d799
debuggerd: use LOCAL_MULTILIB
...
Use LOCAL_MULTILIB to build multiple versions of executables
instead of manually creating two build rules.
Change-Id: I1a993ff7b5f527a88735f46eec9822bb97d16490
2014-03-26 15:16:23 -07:00
Michael Wright
a45ff0f586
am df33e8b5
: Add BitSet64. DO NOT MERGE
...
* commit 'df33e8b544c457e4b08e8fa0b8a3eaf5eaf8fc2e':
Add BitSet64. DO NOT MERGE
2014-03-26 19:29:05 +00:00
Colin Cross
d3113afc47
am 707f5b40
: am 6940bc08
: Merge "adb: Add USB vendor ID for Intermec Technologies Corp."
...
* commit '707f5b401ec354851c0e1b22c8ddb6aba45fba66':
adb: Add USB vendor ID for Intermec Technologies Corp.
2014-03-26 18:26:14 +00:00
Colin Cross
707f5b401e
am 6940bc08
: Merge "adb: Add USB vendor ID for Intermec Technologies Corp."
...
* commit '6940bc08e2932ede027a846ee4c2084782be2f4b':
adb: Add USB vendor ID for Intermec Technologies Corp.
2014-03-26 11:22:32 -07:00
Colin Cross
6940bc08e2
Merge "adb: Add USB vendor ID for Intermec Technologies Corp."
2014-03-26 18:16:48 +00:00
Mark Salyzyn
e594b20d5f
am 1f25d816
: am 7ce5c714
: Merge "logcat: test arbitrary time to tail"
...
* commit '1f25d81686410a2119aae51fa554b8d4f8758f97':
logcat: test arbitrary time to tail
2014-03-26 18:10:22 +00:00
Mark Salyzyn
f909d9a537
am bdb7445d
: am 62f624b6
: Merge "liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance"
...
* commit 'bdb7445d5c435383179d23ef3afaae70076b5345':
liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance
2014-03-26 18:10:22 +00:00
Mark Salyzyn
1f25d81686
am 7ce5c714
: Merge "logcat: test arbitrary time to tail"
...
* commit '7ce5c714f11b97ac1cbeb47014546462e68e3465':
logcat: test arbitrary time to tail
2014-03-26 11:04:43 -07:00
Mark Salyzyn
bdb7445d5c
am 62f624b6
: Merge "liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance"
...
* commit '62f624b697fd97a5c7ad82963def157819ca3498':
liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance
2014-03-26 11:04:43 -07:00
Mark Salyzyn
7ce5c714f1
Merge "logcat: test arbitrary time to tail"
2014-03-26 17:58:50 +00:00
Mark Salyzyn
62f624b697
Merge "liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance"
2014-03-26 17:58:42 +00:00
Mark Salyzyn
ef7c411ac3
logcat: test arbitrary time to tail
...
- Add tail_time
- Use EXPECT instead of ASSERT to provide more coverage
- Use EXPECT_TRUE/ASSERT_TRUE when comparing NULL
- Itemize order complaints in sorted_order test
Change-Id: I55a7543fa3300c0a9524fac70111e680c2877eea
2014-03-26 10:52:21 -07:00
Mark Salyzyn
8196be3032
liblog: test for LOGGER_ENTRY_MAX_PAYLOAD compliance
...
- Add max_payload test
- Add dual_reader test
- Switch to EXPECT from ASSERT to increase test coverage
Bug: 13514601
Change-Id: I0e1c273e0ec430c0461e424731dbf166f2a3ce1b
2014-03-26 10:49:46 -07:00
Mark Salyzyn
8245af1ffd
liblog: deal with restart of logd
...
- API change, return -errno on failure for log writing
- ENOTCONN results in a reconnection and a retry of the write
Change-Id: Ib0a90b730edeaa7e3a3c9797e4e1b0c81b6adb0a
2014-03-26 09:20:22 -07:00
DanielMo
2b6612ff96
adb: Add USB vendor ID for Intermec Technologies Corp.
...
Change-Id: I6429bca087523829a13f905ae9dfa5f43b7abf8b
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-03-26 15:33:23 +08:00
Michael Wright
df33e8b544
Add BitSet64. DO NOT MERGE
...
Change-Id: Idf3e21dfaa9f90f4dcb1b4d41eed3891dda99561
2014-03-24 16:51:01 -07:00
Mark Salyzyn
f48c687f6c
am 3e1f5ba6
: am c66607a8
: Merge "logd: compile warning message"
...
* commit '3e1f5ba67e0f2403da9278a6226e9f8979f975b7':
logd: compile warning message
2014-03-24 22:06:10 +00:00
Mark Salyzyn
3e1f5ba67e
am c66607a8
: Merge "logd: compile warning message"
...
* commit 'c66607a8aa50da898d85a6c94b0bf8b5f172893e':
logd: compile warning message
2014-03-24 15:00:29 -07:00
Mark Salyzyn
c66607a8aa
Merge "logd: compile warning message"
2014-03-24 21:56:34 +00:00
Colin Cross
6c34c5da49
am 55dd7d75
: (-s ours) am c388b9f2
: (-s ours) Merge "DO NOT MERGE: Revert "delete libnl_2""
...
* commit '55dd7d758d69a10a5edef6cc50c67520e53a2109':
DO NOT MERGE: Revert "delete libnl_2"
2014-03-24 21:18:34 +00:00
Colin Cross
55dd7d758d
am c388b9f2
: (-s ours) Merge "DO NOT MERGE: Revert "delete libnl_2""
...
* commit 'c388b9f241bfd6495ba074ed1e59f93844d4bcd0':
DO NOT MERGE: Revert "delete libnl_2"
2014-03-24 14:12:07 -07:00
Colin Cross
c388b9f241
Merge "DO NOT MERGE: Revert "delete libnl_2""
2014-03-24 21:06:49 +00:00
Mark Salyzyn
ca3292bf71
am bd0962c2
: Merge "logcat: timed tests fail under load"
...
* commit 'bd0962c2d390d87d336f21d1862dcb01b84d1a82':
logcat: timed tests fail under load
2014-03-24 20:28:19 +00:00
Mark Salyzyn
bd0962c2d3
Merge "logcat: timed tests fail under load"
2014-03-24 20:22:09 +00:00
Mark Salyzyn
5fef7b6e31
logcat: timed tests fail under load
...
Change-Id: Ic1cdf0509617720eef7a3ad0b17a3b6f88c9d87e
2014-03-24 13:19:17 -07:00
Mark Salyzyn
8aa8d1efc1
am e148b7eb
: Merge "logcat: white and blacklist failure"
...
* commit 'e148b7ebd0d4f0ba38eb0ed4ae0ed36d53e66562':
logcat: white and blacklist failure
2014-03-24 19:48:09 +00:00
Mark Salyzyn
e148b7ebd0
Merge "logcat: white and blacklist failure"
2014-03-24 19:38:07 +00:00
Mark Salyzyn
0a0cc7192e
init.rc: Add lmkd service back
...
- not impressed with conflict for merge f8f0531b
Change-Id: I5b9a1a93ea0cf7eda4ced8dcfc9d0ad70f7aa6c8
2014-03-21 17:41:52 -07:00
Colin Cross
a63a9ec808
DO NOT MERGE: Revert "delete libnl_2"
...
This reverts commit 7097f052d9
.
libnl_2 needs to stay in AOSP for now for compatibility with
GPL test builds.
2014-03-21 17:05:29 -07:00
Mark Salyzyn
bdef5499d4
resolved conflicts for merge of f8f0531b
to klp-modular-dev-plus-aosp
...
Change-Id: I87228aa0dbd0b909437c85812f2404ca8be39f38
2014-03-21 16:57:22 -07:00
Mark Salyzyn
f8f0531bb6
Merge "logd: core requirement"
2014-03-21 23:16:55 +00:00
Mark Salyzyn
3c253dc88f
logd: core requirement
...
- has no dependency on /data, switch from main to core
Change-Id: I4bfe3e67d4cbd31e943c609f5626e533857a27a9
2014-03-21 16:06:54 -07:00
Mark Salyzyn
dbb708a0a1
logd: compile warning message
...
Change-Id: I7ddd010031299395cad96f1743d7a7e6a6866b4c
2014-03-21 15:48:05 -07:00
Mark Salyzyn
22e287df0d
logcat: white and blacklist failure
...
- logcat improperly squashes out count
- logcat test enhanced to catch failure
- logd places entries in ascending sorted order
Change-Id: If39d8e2c40852b520c98e7840034ab63c2538e5d
2014-03-21 15:43:31 -07:00
Mark Salyzyn
abf0853702
am ee212d00
: Merge "logd: liblog: Thread IDs missing from logcat -v thread"
...
* commit 'ee212d0053c6c8801dbd382d24c776040c4f8f0e':
logd: liblog: Thread IDs missing from logcat -v thread
2014-03-21 20:20:29 +00:00
Mark Salyzyn
ee212d0053
Merge "logd: liblog: Thread IDs missing from logcat -v thread"
2014-03-21 20:09:29 +00:00
Mark Salyzyn
b992d0d7d3
logd: liblog: Thread IDs missing from logcat -v thread
...
- stuff caller's thread id into the packet.
Bug: 13568206
Change-Id: I02d0cdf9b1d9e839ff8969f591db42dfe6e4cc95
2014-03-21 10:37:44 -07:00
Colin Cross
dd4720d658
am 5ad986ab
: Merge "delete libnl_2"
...
* commit '5ad986ab5690291422f86c03c3fe71a1c50faf40':
delete libnl_2
2014-03-20 22:16:30 +00:00
JP Abgrall
ff66a06851
am 4db6ce8e
: Merge "Adding documentation on the sync part of the adb protocol previously missing."
...
* commit '4db6ce8e353458de751394102084bb3a304a7ff6':
Adding documentation on the sync part of the adb protocol previously missing.
2014-03-20 22:11:56 +00:00
Colin Cross
5ad986ab56
Merge "delete libnl_2"
2014-03-20 21:54:18 +00:00
JP Abgrall
4db6ce8e35
Merge "Adding documentation on the sync part of the adb protocol previously missing."
2014-03-20 21:25:42 +00:00
Mark Salyzyn
46f3ebba31
am 28171447
: Merge "cutils: trace 64-bit compile issues"
...
* commit '28171447f8b02f85878d3f67920cf941a133c642':
cutils: trace 64-bit compile issues
2014-03-20 20:48:52 +00:00
Mark Salyzyn
28171447f8
Merge "cutils: trace 64-bit compile issues"
2014-03-20 20:39:02 +00:00
Colin Cross
7097f052d9
delete libnl_2
...
libnl_2 has been replaced by external/libnl
Change-Id: I1fa964f4fdc24511f497ebadcb4aa3e786fc8456
2014-03-20 13:07:22 -07:00