Narayan Kamath
bfed136068
am 1ed1d341: am 26fa5cd3: Merge "AArch64: Use negative values in error enumeration"
...
* commit '1ed1d341baaba1d1453dbd061476d4263f17aa28':
AArch64: Use negative values in error enumeration
2014-02-27 13:30:09 +00:00
Narayan Kamath
1ed1d341ba
am 26fa5cd3: Merge "AArch64: Use negative values in error enumeration"
...
* commit '26fa5cd39d39c2954d4c9abd866e39bf1d8d39ae':
AArch64: Use negative values in error enumeration
2014-02-27 13:26:41 +00:00
Narayan Kamath
26fa5cd39d
Merge "AArch64: Use negative values in error enumeration"
2014-02-27 13:18:18 +00:00
Christopher Ferris
a6631bb38f
am 3bcefc66: am 62f12bd9: Merge "Enable libunwind for mips."
...
* commit '3bcefc661347ec6424403fca664fc7caacc7e7fb':
Enable libunwind for mips.
2014-02-26 22:34:57 +00:00
Nick Kralevich
e6fb169fd6
am e570fd3a: am 9453bce4: Merge "Apply restorecon_recursive to all of /data."
...
* commit 'e570fd3a32a3a3525a2e6a069d2b69c6184db56e':
Apply restorecon_recursive to all of /data.
2014-02-26 22:34:57 +00:00
Mark Salyzyn
08c349af44
am 8dd3ad12: am 78617a08: Merge changes Id25cdef0,I80685cdc,I929dddc7
...
* commit '8dd3ad1281aacdff9b404eb7bc2266131c4dd1ff':
logd: Add SCHED_BATCH to reduce priority
logd: Adjust to match defacto coding style
logd: prune more aggressively when over the top
2014-02-26 22:34:56 +00:00
Nick Kralevich
edc1abf1bb
am 1bb3489e: resolved conflicts for merge of e9c8fb90 to klp-modular-dev-plus-aosp
...
* commit '1bb3489e600876979146a6222ac5bb2a684702bf':
logd: initial checkin.
2014-02-26 22:31:26 +00:00
Christopher Ferris
3bcefc6613
am 62f12bd9: Merge "Enable libunwind for mips."
...
* commit '62f12bd9b134a7a991d1d80bda563e870cb56e8e':
Enable libunwind for mips.
2014-02-26 22:31:03 +00:00
Nick Kralevich
e570fd3a32
am 9453bce4: Merge "Apply restorecon_recursive to all of /data."
...
* commit '9453bce4cff952aab5c90f5b30c6c12d3e1521e5':
Apply restorecon_recursive to all of /data.
2014-02-26 22:31:02 +00:00
Mark Salyzyn
8dd3ad1281
am 78617a08: Merge changes Id25cdef0,I80685cdc,I929dddc7
...
* commit '78617a0875ccf5662dc69a6fbcc72a7a39ab42a3':
logd: Add SCHED_BATCH to reduce priority
logd: Adjust to match defacto coding style
logd: prune more aggressively when over the top
2014-02-26 22:30:59 +00:00
Nick Kralevich
1bb3489e60
resolved conflicts for merge of e9c8fb90 to klp-modular-dev-plus-aosp
...
Change-Id: I9ee9908a915258937b343de90dce5774d914f03a
2014-02-26 14:02:02 -08:00
Christopher Ferris
62f12bd9b1
Merge "Enable libunwind for mips."
2014-02-26 21:47:52 +00:00
Christopher Ferris
c29a1345a0
Enable libunwind for mips.
...
Change-Id: Ib1d7bea0cb7ac09a9e15c7f429ecfd944649fc87
2014-02-26 13:41:32 -08:00
Mark Salyzyn
ce72e6c43f
am 785fff48: am ca1e3438: Merge "logcat: test: add clear and blocking check"
...
* commit '785fff484474114e3b4f9ade6f1ad555eec10198':
logcat: test: add clear and blocking check
2014-02-26 21:37:31 +00:00
Elliott Hughes
c8c336bd11
am e2c0bc40: am ecb5dd69: Merge "Fix undefined args access for x86_64."
...
* commit 'e2c0bc40954daaed2683eb30d1eba3f9aac62bb0':
Fix undefined args access for x86_64.
2014-02-26 21:37:30 +00:00
Nick Kralevich
9453bce4cf
Merge "Apply restorecon_recursive to all of /data."
2014-02-26 21:36:30 +00:00
Mark Salyzyn
785fff4844
am ca1e3438: Merge "logcat: test: add clear and blocking check"
...
* commit 'ca1e34385706b954e6974094285924d8ff59f860':
logcat: test: add clear and blocking check
2014-02-26 21:34:18 +00:00
Elliott Hughes
e2c0bc4095
am ecb5dd69: Merge "Fix undefined args access for x86_64."
...
* commit 'ecb5dd697ca72828079bf40f932abf9f9ee7b7db':
Fix undefined args access for x86_64.
2014-02-26 21:34:17 +00:00
Mark Salyzyn
78617a0875
Merge changes Id25cdef0,I80685cdc,I929dddc7
...
* changes:
logd: Add SCHED_BATCH to reduce priority
logd: Adjust to match defacto coding style
logd: prune more aggressively when over the top
2014-02-26 21:29:34 +00:00
Mark Salyzyn
e9c8fb900a
Merge "logd: initial checkin."
2014-02-26 21:29:14 +00:00
Mark Salyzyn
ca1e343857
Merge "logcat: test: add clear and blocking check"
2014-02-26 21:28:58 +00:00
Elliott Hughes
ecb5dd697c
Merge "Fix undefined args access for x86_64."
2014-02-26 21:28:27 +00:00
Elliott Hughes
b155b976c7
am 8828994d: am 431735f0: Merge "libcutils: Socket type might contain bitwise OR flags"
...
* commit '8828994d05572552da893db4663efd6e1e77948e':
libcutils: Socket type might contain bitwise OR flags
2014-02-26 19:41:50 +00:00
Elliott Hughes
8828994d05
am 431735f0: Merge "libcutils: Socket type might contain bitwise OR flags"
...
* commit '431735f005af79407e01a68995ac6dde7ff4b815':
libcutils: Socket type might contain bitwise OR flags
2014-02-26 19:38:35 +00:00
Elliott Hughes
431735f005
Merge "libcutils: Socket type might contain bitwise OR flags"
2014-02-26 19:34:40 +00:00
Paul Kocialkowski
a7e2e7634c
libcutils: Socket type might contain bitwise OR flags
...
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Change-Id: Ia5c8f136793a989fc1d71c61292afe4e5cf169fa
2014-02-26 11:33:45 -08:00
Mark Salyzyn
882f856668
logd: Add SCHED_BATCH to reduce priority
...
(cherry picked from commit 85620a1bff )
Change-Id: Id25cdef0dd7f8c5e154a0da2db2dd0554849babc
2014-02-26 09:55:03 -08:00
Mark Salyzyn
c03e72cc1c
logd: Adjust to match defacto coding style
...
(cherry picked from commit c46f77bd2a )
Change-Id: I80685cdc7116e10c5a5a77abe856fd96804f9117
2014-02-26 09:54:23 -08:00
Mark Salyzyn
740f9b4f97
logd: prune more aggressively when over the top
...
(cherry picked from commit 63c15d5061 )
Change-Id: I929dddc7da048c032fb791c7af23f215f8856bf3
2014-02-26 09:53:55 -08:00
Mark Salyzyn
0175b0747a
logd: initial checkin.
...
* Create a new userspace log daemon for handling logging messages.
Original-Change-Id: I75267df16359684490121e6c31cca48614d79856
Signed-off-by: Nick Kralevich <nnk@google.com>
* Merge conflicts
* rename new syslog daemon to logd to prevent confusion with bionic syslog
* replace racy getGroups call with KISS call to client->getGid()
* Timestamps are filed at logging source
* insert entries into list in timestamp order
* Added LogTimeEntry tail filtration handling
* Added region locking around LogWriter list
* separate threads for each writer
* /dev/socket/logd* permissions
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
(cherry picked from commit 3e76e0a497 )
Author: Nick Kralevich <nnk@google.com>
Change-Id: Ice88b1412d8f9daa7f9119b2b5aaf684a5e28098
2014-02-26 09:52:35 -08:00
Mark Salyzyn
9b986497e7
logcat: test: add clear and blocking check
...
(cherry picked from commit 1beb2ab6f6 )
Change-Id: I243b1338c4a5935a297a0519c03697fd828e47e6
2014-02-26 09:52:02 -08:00
Fengwei Yin
fff9d11be5
Fix undefined args access for x86_64.
...
From libc manual for vsnprintf:
The functions vprintf(), vfprintf(), vsprintf(), vsnprintf()
are equivalent to the functions printf(), fprintf(), sprintf(), snprintf(),
respectively, except that they are called with a va_list instead of a
variable number of arguments. These functions do not call the va_end macro.
Because they invoke the va_arg macro, the value of ap is undefined after the call.
We need to allocate/end new va_list for each vsnprintf.
Change-Id: I66ec058033be1cb918e7b2bc84ca546800da226b
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
2014-02-27 01:17:09 +08:00
David 'Digit' Turner
5296ee8e0b
am f936f66c: am ebb46d76: Merge "fs_mgr: Don\'t run e2fsck inside SDK system images."
...
* commit 'f936f66c2abf132dff883f6d31f4cc0b8d20f984':
fs_mgr: Don't run e2fsck inside SDK system images.
2014-02-25 08:34:09 +00:00
David 'Digit' Turner
f936f66c2a
am ebb46d76: Merge "fs_mgr: Don\'t run e2fsck inside SDK system images."
...
* commit 'ebb46d76e4bf4ee4f34b42709ea69cce07e3e322':
fs_mgr: Don't run e2fsck inside SDK system images.
2014-02-25 08:19:12 +00:00
David 'Digit' Turner
ebb46d76e4
Merge "fs_mgr: Don't run e2fsck inside SDK system images."
2014-02-25 04:57:26 +00:00
Elliott Hughes
c80c9dea16
am 4ce33738: am d7590650: Merge "Remove an unused #include of <asm/page.h>."
...
* commit '4ce337385f1cfd54809ba78e4d1d80fbb73b2c43':
Remove an unused #include of <asm/page.h>.
2014-02-25 00:10:09 +00:00
Elliott Hughes
4ce337385f
am d7590650: Merge "Remove an unused #include of <asm/page.h>."
...
* commit 'd7590650dc7b36557efde7f63a6e904878572e12':
Remove an unused #include of <asm/page.h>.
2014-02-25 00:06:49 +00:00
Elliott Hughes
d7590650dc
Merge "Remove an unused #include of <asm/page.h>."
2014-02-25 00:01:46 +00:00
Elliott Hughes
51437ed265
am 56ae6b68: am 410f51a8: Merge "Remove unused #includes of <asm/page.h>."
...
* commit '56ae6b687d93cd0e6275cc575f0a55f5a1546232':
Remove unused #includes of <asm/page.h>.
2014-02-24 23:50:21 +00:00
Elliott Hughes
56ae6b687d
am 410f51a8: Merge "Remove unused #includes of <asm/page.h>."
...
* commit '410f51a88cc40977ddc2d99ae72d429550715e13':
Remove unused #includes of <asm/page.h>.
2014-02-24 23:45:27 +00:00
Elliott Hughes
763bfce0b1
Remove an unused #include of <asm/page.h>.
...
Change-Id: I000aead8c82ec11151f69e6ce439dd09b0f0b4f4
2014-02-24 15:42:22 -08:00
Elliott Hughes
410f51a88c
Merge "Remove unused #includes of <asm/page.h>."
2014-02-24 23:39:49 +00:00
Elliott Hughes
2f77bb6931
Remove unused #includes of <asm/page.h>.
...
(<asm/page.h> is going away.)
Change-Id: Id0d7ad0eb791cd47490c48458f9f8a6468ddf5c9
2014-02-24 15:38:44 -08:00
David 'Digit' Turner
28483d7ec4
fs_mgr: Don't run e2fsck inside SDK system images.
...
These images do not have GPL-ed binaries like /system/bin/e2fsck so
avoid running the program when we detect that we're running inside
one of them.
Note that this does not affect other emulator-based build products
(e..g full-eng instead of sdk-eng), which do have the binaries.
BUG=13057123
Change-Id: Ia42f1d02a3845fbf4b2f9d95818f35d760711a12
2014-02-24 23:32:00 +01:00
Colin Cross
74a41f5adf
am b659ffd7: am deb3eecd: Merge "Fix the definition of LOCAL_PATH in libusbhost/Android.mk"
...
* commit 'b659ffd77d8495e5ac13c4fa3b6717c9945f7b9f':
Fix the definition of LOCAL_PATH in libusbhost/Android.mk
2014-02-22 08:25:49 +00:00
Colin Cross
b659ffd77d
am deb3eecd: Merge "Fix the definition of LOCAL_PATH in libusbhost/Android.mk"
...
* commit 'deb3eecd061e8a3a5f19ef5e10296f248f247881':
Fix the definition of LOCAL_PATH in libusbhost/Android.mk
2014-02-22 08:21:47 +00:00
Colin Cross
deb3eecd06
Merge "Fix the definition of LOCAL_PATH in libusbhost/Android.mk"
2014-02-22 08:16:03 +00:00
Alex Ray
4fc8231c18
Merge "graphics: Add colorspace definitions" into klp-volantis-dev
2014-02-21 23:54:05 +00:00
Elliott Hughes
24d06bc9c6
am bed58bf3: am 536dce31: Merge "Fix compiler warnings in libpixelflinger"
...
* commit 'bed58bf36fa9870fb0920c0c51e065e9a4eb3f5e':
Fix compiler warnings in libpixelflinger
2014-02-20 22:31:05 +00:00
Elliott Hughes
bed58bf36f
am 536dce31: Merge "Fix compiler warnings in libpixelflinger"
...
* commit '536dce31d35e9411c03102d6abd837cd4d54ce55':
Fix compiler warnings in libpixelflinger
2014-02-20 22:28:48 +00:00