Colin Cross
c388b9f241
Merge "DO NOT MERGE: Revert "delete libnl_2""
2014-03-24 21:06:49 +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
e148b7ebd0
Merge "logcat: white and blacklist failure"
2014-03-24 19:38:07 +00: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
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
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
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
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
Mark Salyzyn
a459d0b0e2
cutils: trace 64-bit compile issues
...
- switch format to PRId64 for int64_t
- switch format to PRId32 for int32_t
Change-Id: I1e66db06810000936d584ed49234550abd96cdff
2014-03-20 13:02:57 -07:00
Samuel Carlsson
912d5dddf8
Adding documentation on the sync part of the adb protocol previously missing.
...
In the SERVICES.TXT a missing documentation file is mentioned - SYNC.TXT. This file is supposed to contain all the godie bits of the adb protocol for pushing and pulling files. I've read the source code and documented this in the file SYNC.TXT. I've used my own documentation to create a java implementation to verify the documentation here: https://github.com/vidstige/jadb
Added line breaks at 78 characters. Added comments about remote files might be deleted.
Change-Id: I48c87c2a9fb5b59b85c72679124dfbbfa9a701bc
Signed-off-by: Samuel Carlsson <samuel.carlsson@gmail.com>
2014-03-20 20:36:46 +01:00
Alex Ray
6035797586
Merge "fastbootd: build static binary instead of dynamic"
2014-03-20 17:58:01 +00:00
Alex Ray
17ab454501
fastbootd: build static binary instead of dynamic
...
This removes the requirement to hunt down dynamic libs for building an image,
and switches the normal vendor_trigger HAL to a static HAL.
Change-Id: Ifb603f1ee91fbbbff04ddbe66a1bf38a3c22be9e
2014-03-19 15:57:40 -07:00
Alex Ray
3fcd9ed6e3
Merge "ueventd: fix klog debug typo"
2014-03-19 22:20:43 +00:00
Alex Ray
eb6ffc765b
ueventd: fix klog debug typo
...
Change-Id: Ib0acece15145cc0e868452ede8f3acbab419b965
2014-03-19 15:17:59 -07:00
Colin Cross
c383c6d1d8
Merge "Add "import" support to system property files."
2014-03-19 20:32:14 +00:00
Jeff Sharkey
06f8c09542
Add "import" support to system property files.
...
During boot, allow a property file to import properties from another
file. Supports importing the entire file, a specific key, or any
keys matching a specific prefix. Here's some example syntax:
import /oem/oem.prop
import /oem/oem.prop foo.*
import /oem/oem.prop foo.bar
Bug: 13340779
Change-Id: I867f9a10ca09684326675d9f051f5cf2ae171617
2014-03-19 13:31:36 -07:00
Mark Salyzyn
208dae2ee8
Merge "logd: Logging is truncated"
2014-03-18 23:22:18 +00:00
Mark Salyzyn
b059cf53c9
logd: Logging is truncated
...
- stack buffer undersized
Bug: 13514601
Change-Id: I3e5dda2daa7531ddcacece33dfdecaa28dcca765
2014-03-18 16:03:34 -07:00
Mark Salyzyn
6c92369cbe
Merge "logcat: improve error messages"
2014-03-18 16:50:14 +00:00
Mark Salyzyn
fff04e3014
logcat: improve error messages
...
Bug: 13464830
Change-Id: Ia8783fa2422e444bcdfca8d0153cf6e7634612bb
2014-03-18 09:43:03 -07:00
Doug Zongker
2beed94194
Merge "update minui library call"
2014-03-17 22:56:39 +00:00
Greg Hackmann
998e022748
Merge "liblog: improve errno handling on read failure"
2014-03-17 20:45:52 +00:00
Greg Hackmann
8084a53897
liblog: improve errno handling on read failure
...
1. socket() failures should skip close(), since sock is not an open fd
2. on other I/O related failures, preserve errno around the close() call
3. set errno to a meaningful value on check_log_success() failure
Change-Id: I0fb9e726ae5fee2f7b84344aa925e5159d57c360
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-17 13:16:27 -07:00
Doug Zongker
0709917e25
update minui library call
...
The names of the res_create_* functions have changed.
Change-Id: I9990bb4f6e6dc2d7c62e2cb9e0831532c83b2bb9
2014-03-17 12:23:00 -07:00
Brian Carlstrom
a0915abd2f
Merge "Fix build some more"
2014-03-15 21:19:28 +00:00
Christopher Tate
5a6b8d15ea
Fix build some more
...
Missed one.
(cherry picked from commit f7f080ce62
)
Change-Id: I33bf8bcc651330b9bc434da02c47c29bc0d54369
2014-03-15 14:16:26 -07:00
Brian Carlstrom
8e01210767
Merge "Fix the build"
2014-03-15 20:59:19 +00:00
Christopher Tate
dc507769b5
Fix the build
...
(cherry-picked from commit 296dc44637
)
Change-Id: I924f4796fbb70a0f45cc23a852e26e634c5b0e0e
2014-03-15 13:57:34 -07:00
Mark Salyzyn
7ad096340f
Merge "libziparchive: 64 bit compile issues"
2014-03-14 23:30:40 +00:00
Mark Salyzyn
99ef9914be
libziparchive: 64 bit compile issues
...
- All within LOG messages.
Change-Id: I52e81b49e8127276359c62febd4cc1d8d69102d9
2014-03-14 14:47:15 -07:00
Mark Salyzyn
31fa960474
Merge "toolbox: ls: 64 bit compile warnings"
2014-03-14 20:52:59 +00:00
Mark Salyzyn
4727c7711e
toolbox: ls: 64 bit compile warnings
...
Change-Id: Ia538c7177f8d5cf2c1f0efb5b575da6527c13968
2014-03-14 13:47:16 -07:00
David 'Digit' Turner
ee223d50a0
Merge "adb: Increase the max number of emulator instances to 64"
2014-03-14 20:27:47 +00:00
Mark Salyzyn
3b8de6705b
Merge "liblog: Build Breakage in sdk(linux)"
2014-03-14 19:18:23 +00:00
Mark Salyzyn
c0626fdcaf
liblog: Build Breakage in sdk(linux)
...
- Build Breakage in branch: aosp-idea133 @ 1072786
Change-Id: I36da253b69a66977ec568a5f96d38b970c25fe3e
2014-03-14 12:05:57 -07:00
Mark Salyzyn
fc204a966f
Merge changes Ia9509ad0,I4e815d74,I10e8d92c
...
* changes:
logcat: test White Black list
logd: Find log time for arbitrary time to tail
logd: liblog: logcat: Arbitrary time to tail
2014-03-14 17:49:42 +00:00
Mark Salyzyn
95cfc7b8e2
logcat: test White Black list
...
Change-Id: Ia9509ad09dd86e4d9169ed7d0b33911f1ca9eec6
2014-03-14 10:24:42 -07:00
Mark Salyzyn
a1c60cf80d
logd: Find log time for arbitrary time to tail
...
- prototype to evaluate the increase in complexity or
performance impact.
Change-Id: I4e815d74c023092fbb75055d260f75de57ad6522
2014-03-14 10:24:19 -07:00
Mark Salyzyn
fa3716b250
logd: liblog: logcat: Arbitrary time to tail
...
Change-Id: I10e8d92c933e31ee11e78d2d1114261a30c4be0e
2014-03-14 10:23:51 -07:00
Mark Salyzyn
6ab10a1c17
Merge "libdiskconfig: 64-bit issues"
2014-03-14 01:03:31 +00:00
Mark Salyzyn
1874e6557c
libdiskconfig: 64-bit issues
...
Change-Id: Ie5e790c36395ec2f844294b91241a8f8ba3834b8
2014-03-13 17:46:53 -07:00
Mark Salyzyn
1a3798996b
Merge "toolbox: schedtop 64 bit build issue"
2014-03-14 00:31:45 +00:00
Mark Salyzyn
161b55fc5d
toolbox: schedtop 64 bit build issue
...
Change-Id: I77b8ca2c32b9ff33abb6acadae47f0ab47b47907
2014-03-13 17:14:15 -07:00