Elliott Hughes
35d70a2767
am 0e0fbdd1: am 492dd1e5: Merge "Remove obsolete BUILD_TINY_ANDROID check from healthd makefile"
...
* commit '0e0fbdd1fcef71e653ad2d988649f6259b304fc2':
Remove obsolete BUILD_TINY_ANDROID check from healthd makefile
2015-01-24 16:58:25 +00:00
Chih-Hung Hsieh
f410d52173
am 7e3fc71e: am cb4ae20d: Merge "Enable clang for init, after fix of global .mk files."
...
* commit '7e3fc71ee2eb31fe40f278ce17f72090a9b13620':
Enable clang for init, after fix of global .mk files.
2015-01-24 16:58:16 +00:00
Mark Salyzyn
6077754e14
am 49f38385: am 3e57869c: Merge "logd: fix persistent blocking reader performance"
...
* commit '49f38385c977902f4ee08493ecfde5fa972fcd8e':
logd: fix persistent blocking reader performance
2015-01-24 16:58:08 +00:00
Mark Salyzyn
66d51342c8
am 982421df: am 91581f19: Merge "liblog: add pstore write"
...
* commit '982421df4584f5691b33444ae3e18b81d6544b6a':
liblog: add pstore write
2015-01-24 16:57:50 +00:00
Mark Salyzyn
f0752a8e5e
am 95a68d3b: am 69bdba21: Merge "liblog: use private/android_logger.h"
...
* commit '95a68d3b5beb9ca0eb50276578a47f3f0882e199':
liblog: use private/android_logger.h
2015-01-24 16:57:49 +00:00
Mark Salyzyn
cd7ef90e62
am f0cc42f5: am 4730328d: Merge "logd: create private/android_logger.h"
...
* commit 'f0cc42f525c237431aa560ff42a3e8548bfbd3f4':
logd: create private/android_logger.h
2015-01-24 16:57:48 +00:00
Chih-Hung Hsieh
70a613ffd7
am 8e65c371: am 2c7f05d8: Merge "Remove unused -ldl to link true statically."
...
* commit '8e65c3712fbacd7d2f7e58975a1a2f1fa290f1b5':
Remove unused -ldl to link true statically.
2015-01-24 16:57:42 +00:00
Elliott Hughes
0e0fbdd1fc
am 492dd1e5: Merge "Remove obsolete BUILD_TINY_ANDROID check from healthd makefile"
...
* commit '492dd1e5c1c47bc8a804b58bed941c8eaa94d9a3':
Remove obsolete BUILD_TINY_ANDROID check from healthd makefile
2015-01-24 05:33:56 +00:00
Elliott Hughes
492dd1e5c1
Merge "Remove obsolete BUILD_TINY_ANDROID check from healthd makefile"
2015-01-24 05:22:14 +00:00
Trevor Drake
27d53d3d86
Remove obsolete BUILD_TINY_ANDROID check from healthd makefile
...
Change-Id: I7e23236e7725891d07368dd8ea8d667014d7dc78
2015-01-24 04:26:16 +00:00
Chih-Hung Hsieh
7e3fc71ee2
am cb4ae20d: Merge "Enable clang for init, after fix of global .mk files."
...
* commit 'cb4ae20d7280f0376a79a6e993fd1e9cee1c403d':
Enable clang for init, after fix of global .mk files.
2015-01-24 01:24:13 +00:00
Chih-Hung Hsieh
cb4ae20d72
Merge "Enable clang for init, after fix of global .mk files."
2015-01-24 01:14:23 +00:00
Mark Salyzyn
49f38385c9
am 3e57869c: Merge "logd: fix persistent blocking reader performance"
...
* commit '3e57869cccf89fc6f700e61fd13049a17a57637a':
logd: fix persistent blocking reader performance
2015-01-24 00:31:04 +00:00
Mark Salyzyn
3e57869ccc
Merge "logd: fix persistent blocking reader performance"
2015-01-24 00:17:03 +00:00
Dragoslav Mitrinovic
8e8e8db549
logd: fix persistent blocking reader performance
...
logd suffers major performance degradation when persistent (blocking)
client reader connects to it (e.g. logcat). The root cause of the
degradation is that each time when reader is notified of the arrival
of new log entries, the reader commences its search for the new entries
from the beginning of the linked list (oldest entries first).
This commit alters the search to start from the end of the linked list
and work backwards. This dramatically decreases logd CPU consumption
when blocking reader is connected, and increases the maximum logging
throughput (before the logs start getting lost) by a factor ~ 20.
Change-Id: Ib60955ce05544e52a8b24acc3dcf5863e1e39c5c
2015-01-24 00:10:34 +00:00
Mark Salyzyn
982421df45
am 91581f19: Merge "liblog: add pstore write"
...
* commit '91581f19906ade01eabc6e10a7dac209e710117a':
liblog: add pstore write
2015-01-23 23:59:45 +00:00
Mark Salyzyn
95a68d3b5b
am 69bdba21: Merge "liblog: use private/android_logger.h"
...
* commit '69bdba21f6915735c15aa4ba9ad33b9048d7032d':
liblog: use private/android_logger.h
2015-01-23 23:59:44 +00:00
Mark Salyzyn
f0cc42f525
am 4730328d: Merge "logd: create private/android_logger.h"
...
* commit '4730328da72ef9b7aeaefc120358155fdfd8dde8':
logd: create private/android_logger.h
2015-01-23 23:59:43 +00:00
Zhijun He
7be3af0a7a
Merge "camera: add external camera facing enum"
2015-01-23 23:57:59 +00:00
Mark Salyzyn
91581f1990
Merge "liblog: add pstore write"
2015-01-23 23:33:43 +00:00
Mark Salyzyn
d91ab5815d
liblog: add pstore write
...
Used to push the Android log messages into pstore
(when available, and no propagation of error).
Change-Id: I9def8cf796d35d347f502d9745d5f42ec1200253
2015-01-23 23:33:31 +00:00
Chih-Hung Hsieh
8e65c3712f
am 2c7f05d8: Merge "Remove unused -ldl to link true statically."
...
* commit '2c7f05d88c3d59eea5ce82a4762cf3c6477565c7':
Remove unused -ldl to link true statically.
2015-01-23 23:33:13 +00:00
Mark Salyzyn
69bdba21f6
Merge "liblog: use private/android_logger.h"
2015-01-23 23:33:08 +00:00
Mark Salyzyn
7a80940121
liblog: use private/android_logger.h
...
- fix a latent issue with retransmitting on failure.
Change-Id: I2d0e5c3531c279f2dc1fbd74807210ff8d804de1
2015-01-23 23:32:50 +00:00
Mark Salyzyn
4730328da7
Merge "logd: create private/android_logger.h"
2015-01-23 23:32:23 +00:00
Mark Salyzyn
b5f6e45d6b
logd: create private/android_logger.h
...
- create a structure to depict the private header
expected at logd end of socket.
- utilize this new structure instead of unscalable
byte stream technique used to unpack in logd.
Change-Id: I2d0e5c3531c279f2dc1fbd74807210ff8d804de0
2015-01-23 23:32:11 +00:00
Chih-Hung Hsieh
2c7f05d88c
Merge "Remove unused -ldl to link true statically."
2015-01-23 23:20:58 +00:00
Chih-Hung Hsieh
87997bf8e7
Remove unused -ldl to link true statically.
...
LOCAL_FORCE_STATIC_EXECUTABLE=true failed with -ldl.
Change-Id: Id42031ba8e86279b5229ed11cd82e86a5f833ff9
2015-01-23 14:39:54 -08:00
Elliott Hughes
9f36a37c24
am 0944e305: am 4e0bdd10: Merge "fs_mgr: Support filesystem labels in fstab"
...
* commit '0944e305ff0a04fd1be8c1d5d157e68d11936802':
fs_mgr: Support filesystem labels in fstab
2015-01-23 19:56:50 +00:00
David 'Digit' Turner
a80fc8399a
am 320ead2a: am 1bc38a4c: Merge "adb: Fix \'adb forward --no-rebind\'."
...
* commit '320ead2ac37fbce69d84a39da28ce873b4a816d7':
adb: Fix 'adb forward --no-rebind'.
2015-01-23 19:56:05 +00:00
Elliott Hughes
0944e305ff
am 4e0bdd10: Merge "fs_mgr: Support filesystem labels in fstab"
...
* commit '4e0bdd1034ffcf55f4ebcbd547cf4aad59c05f03':
fs_mgr: Support filesystem labels in fstab
2015-01-23 18:20:50 +00:00
Elliott Hughes
4e0bdd1034
Merge "fs_mgr: Support filesystem labels in fstab"
2015-01-23 18:11:26 +00:00
Christoffer Dall
8298234847
fs_mgr: Support filesystem labels in fstab
...
When mounting fstab entries it is practical to be able to specify
for example LABEL=data instead of a specific block device.
This is particularly important for the new Android Emulator code base,
which uses virtio block devices for the various partitions
(system,data,cache), because there is no defined ordering between the
way the filesystems are specified to the emulator and how they are
enumerated by the android kernel as /dev/vdX.
Change-Id: I7aef95f12e8f7b02ac2e33804ba7897fdcb9ad7f
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2015-01-23 17:47:39 +00:00
David 'Digit' Turner
320ead2ac3
am 1bc38a4c: Merge "adb: Fix \'adb forward --no-rebind\'."
...
* commit '1bc38a4cdc74f477b99185125089f20411baf431':
adb: Fix 'adb forward --no-rebind'.
2015-01-23 16:55:37 +00:00
David 'Digit' Turner
1bc38a4cdc
Merge "adb: Fix 'adb forward --no-rebind'."
2015-01-23 16:45:46 +00:00
David 'Digit' Turner
f0e0c2e458
adb: Fix 'adb forward --no-rebind'.
...
Due to a typo, the --no-rebind option never worked (it always failed).
The root of the problem was that the client was sending on the wire
a command like:
host:forward:norebind::tcp:<port>;tcp:<port>
^^
Instead of:
host:forward:norebind:tcp:<port>;tcp:<port>
^
Note the erroneous double-column.
The fix is local to the adb client and thus doesn't require a new
version of the server or guest adbd on the device-side.
This also fixes 'adb reverse --no-rebind'.
See https://code.google.com/p/chromium/issues/detail?id=451109
Change-Id: I680fd432b5470072f6a9968ca32a7f90c600ac68
2015-01-23 10:02:58 +01:00
Elliott Hughes
f0ff493d4b
am 1fdd4dc0: am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in fstab""
...
* commit '1fdd4dc0bc44af0dbbd458b44a84db9e775ebe7d':
Revert "fs_mgr: Support filesystem labels in fstab"
2015-01-23 03:11:23 +00:00
JP Abgrall
2e4bcade9b
am 253b9cfb: am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab"
...
* commit '253b9cfba53d3f45e908856d311e28de9e5c1017':
fs_mgr: Support filesystem labels in fstab
2015-01-23 03:11:21 +00:00
Elliott Hughes
1fdd4dc0bc
am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in fstab""
...
* commit '4083ed7dff6e1dd8e20bec04f9451061951394f5':
Revert "fs_mgr: Support filesystem labels in fstab"
2015-01-23 00:50:46 +00:00
JP Abgrall
253b9cfba5
am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab"
...
* commit 'f9e2339553f70aebdd170e96ab9332b28c3851b4':
fs_mgr: Support filesystem labels in fstab
2015-01-23 00:50:36 +00:00
Elliott Hughes
4083ed7dff
Merge "Revert "fs_mgr: Support filesystem labels in fstab""
2015-01-23 00:34:08 +00:00
Elliott Hughes
572226c25c
Revert "fs_mgr: Support filesystem labels in fstab"
...
This reverts commit 69407ccb02
.
Change-Id: I537a3b4257b7bc2a69f1f4d62b4e18e91f2dc713
2015-01-23 00:33:43 +00:00
JP Abgrall
f9e2339553
Merge "fs_mgr: Support filesystem labels in fstab"
2015-01-22 23:59:05 +00:00
Chih-Hung Hsieh
d3d4741584
Enable clang for init, after fix of global .mk files.
...
LOCAL_FORCE_STATIC_EXECUTABLE was not working properly for clang
because -Bstatic was ignored by clang. We can now enable clang
for init after the -static flag is added to link static executable
files in build/core/definitions.mk.
BUG: 18008984
Change-Id: I3f361b83c1e0b313914603dff33fd090cd3b116a
2015-01-22 15:28:56 -08:00
Zhijun He
46e0a589d5
camera: add external camera facing enum
...
This is to enable the external camera support.
Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
2015-01-22 13:43:09 -08:00
Mark Salyzyn
ed5a716817
am 6f355d2c: am 045be135: Merge "liblog: logcat color output corrupted on 32-bit"
...
* commit '6f355d2c8f661caa3ec6e814c5be7c3ec077de3e':
liblog: logcat color output corrupted on 32-bit
2015-01-22 19:58:06 +00:00
Christopher Ferris
c02312c119
am bd3bbff6: am d426a4e7: Merge "Move 32 bit/64 bit check into debuggerd."
...
* commit 'bd3bbff6743432564325d4acf7ddecb7ad65f7bc':
Move 32 bit/64 bit check into debuggerd.
2015-01-22 19:58:06 +00:00
Mark Salyzyn
6f355d2c8f
am 045be135: Merge "liblog: logcat color output corrupted on 32-bit"
...
* commit '045be135de5acee7a2d0fd7e303dc15ded2d69fa':
liblog: logcat color output corrupted on 32-bit
2015-01-22 19:08:27 +00:00
Mark Salyzyn
045be135de
Merge "liblog: logcat color output corrupted on 32-bit"
2015-01-22 18:12:14 +00:00
Mark Salyzyn
e2428429e0
liblog: logcat color output corrupted on 32-bit
...
sizeof(suffixBuf), not sizeof(suffixLen)!
Change-Id: I6e085089237585bb8b406372639b644556747699
2015-01-22 10:00:04 -08:00