Elliott Hughes
ea8dcdcf64
am 21ecc30c: Merge "Fix fastbootd build for 64-bit."
...
* commit '21ecc30cd0bb0eb5035d48e4eb0e78d6a509dd8d':
Fix fastbootd build for 64-bit.
2014-01-14 16:29:53 -08:00
Elliott Hughes
21ecc30cd0
Merge "Fix fastbootd build for 64-bit."
2014-01-15 00:24:37 +00:00
Elliott Hughes
4f24125ccc
Fix fastbootd build for 64-bit.
...
Change-Id: I04bef46f0125fd6a8fc0cb966bd257ad594aff1e
2014-01-14 16:17:08 -08:00
Glenn Kasten
765aef9c13
Merge "Add AUDIO_SESSION_ALLOCATE"
2014-01-15 00:15:37 +00:00
Elliott Hughes
c3149359a0
am af16bf4f: am 9c1cbe83: am 53cd1484: am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."
...
* commit 'af16bf4f5160c03c858b32c40900f07f1e9c0366':
Don't set LD_LIBRARY_PATH globally.
2014-01-15 00:14:43 +00:00
Glenn Kasten
b4f2b4eac4
Add AUDIO_SESSION_ALLOCATE
...
Change-Id: I045f2f04520bc474666c43a0ff1568f0fab3567c
2014-01-14 16:14:18 -08:00
Elliott Hughes
af16bf4f51
am 9c1cbe83: am 53cd1484: am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."
...
* commit '9c1cbe8373f28c9a6d6ba489af3e9247647dc469':
Don't set LD_LIBRARY_PATH globally.
2014-01-15 00:11:31 +00:00
Elliott Hughes
9c1cbe8373
am 53cd1484: am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."
...
* commit '53cd1484aa13c43b4d6973c1c203dbff9c996d14':
Don't set LD_LIBRARY_PATH globally.
2014-01-15 00:08:39 +00:00
Elliott Hughes
53cd1484aa
am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."
...
* commit 'aead003c8bc677218329c535b063a5bb66695414':
Don't set LD_LIBRARY_PATH globally.
2014-01-14 16:05:23 -08:00
Elliott Hughes
aead003c8b
Merge "Don't set LD_LIBRARY_PATH globally."
2014-01-14 23:59:09 +00:00
Elliott Hughes
49cf122d25
am 7b80c138: am 7c7d76f4: am ab3d5036: am d47ffb88: Merge "AArch64: Add atomic functions"
...
* commit '7b80c1381581bd3c0c28440236e043888c49087d':
AArch64: Add atomic functions
2014-01-14 23:43:47 +00:00
Elliott Hughes
7b80c13815
am 7c7d76f4: am ab3d5036: am d47ffb88: Merge "AArch64: Add atomic functions"
...
* commit '7c7d76f47fc085219ad010c21b80e2ce521efb1b':
AArch64: Add atomic functions
2014-01-14 23:41:38 +00:00
Elliott Hughes
7c7d76f47f
am ab3d5036: am d47ffb88: Merge "AArch64: Add atomic functions"
...
* commit 'ab3d5036271a214e88ceb7482564e69c0249339e':
AArch64: Add atomic functions
2014-01-14 23:38:29 +00:00
Elliott Hughes
ab3d503627
am d47ffb88: Merge "AArch64: Add atomic functions"
...
* commit 'd47ffb8890b937ee4f162032d9426f45b52b4346':
AArch64: Add atomic functions
2014-01-14 15:36:57 -08:00
Elliott Hughes
d47ffb8890
Merge "AArch64: Add atomic functions"
2014-01-14 23:32:22 +00:00
Ashok Bhat
c15d2ce5fc
AArch64: Add atomic functions
...
This patch adds atomic functions for AArch64. The functions
will be revisited later for potential optimizations using
assembly or otherwise.
This patch also introduces new 64-bit atomic functions for
LP64 platforms.
Change-Id: Id2127dd01cea65025f939e955d73d27e95d8687e
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-01-14 12:45:58 -08:00
William Roberts
21095d0cae
fs_mgr: correct warning on unused function parameter
...
target thumb C: libfs_mgr <= system/core/fs_mgr/fs_mgr.c
system/core/fs_mgr/fs_mgr.c: In function 'fs_mgr_add_entry':
system/core/fs_mgr/fs_mgr.c:828:56: warning: unused parameter 'length' [-Wunused-parameter]
const char *blk_device, long long length)
Change-Id: Ide1bfa120c4f8d8e2f643929cb84c1be065e3310
2014-01-14 15:04:56 -05:00
Christopher Ferris
475377b68a
am 117e93a7: am 2c3b9a44: am d9cb2964: am 91e2019f: Merge "Create a bare bones host libbacktrace on mac."
...
* commit '117e93a7208d028ccbc444aad8bd5ad250459c67':
Create a bare bones host libbacktrace on mac.
2014-01-14 18:13:24 +00:00
Christopher Ferris
117e93a720
am 2c3b9a44: am d9cb2964: am 91e2019f: Merge "Create a bare bones host libbacktrace on mac."
...
* commit '2c3b9a444f44402142f3ca37a91f529fc81fbfd3':
Create a bare bones host libbacktrace on mac.
2014-01-14 18:11:09 +00:00
Christopher Ferris
2c3b9a444f
am d9cb2964: am 91e2019f: Merge "Create a bare bones host libbacktrace on mac."
...
* commit 'd9cb2964e2d3428b24392a36ea7ad3b9014775f6':
Create a bare bones host libbacktrace on mac.
2014-01-14 18:08:33 +00:00
Christopher Ferris
d9cb2964e2
am 91e2019f: Merge "Create a bare bones host libbacktrace on mac."
...
* commit '91e2019f81a839b71cfcff75129d1c1fdd552dcb':
Create a bare bones host libbacktrace on mac.
2014-01-14 10:06:27 -08:00
Christopher Ferris
91e2019f81
Merge "Create a bare bones host libbacktrace on mac."
2014-01-14 18:03:10 +00:00
Mark Salyzyn
73459a5c87
liblog: deprecate export of LOGGER_LOG_* defines
...
Change-Id: I263af8e889f8f2ad91b91757caf90a4d17823dab
2014-01-14 07:51:14 -08:00
Christopher Ferris
f67c6410d1
Create a bare bones host libbacktrace on mac.
...
This allows the libbacktrace library to compile for host on mac.
Bug: 12474939
Change-Id: I32cbcf996e6fe9057e5065ba21f89086343704a0
2014-01-13 23:57:35 -08:00
Christopher Ferris
4167d7e5c2
resolved conflicts for merge of 8791ee5c
to master
...
Change-Id: I107bb055941809331c451c1d903f231f07a86ece
2014-01-13 18:14:11 -08:00
Christopher Ferris
8791ee5c14
am 50fae736: am 1f71e465: am 68870199: Merge "Next phase of the move, reformat use C++ features."
...
* commit '50fae736dc0a5552e9e14d8e8358449aa0f7536a':
Next phase of the move, reformat use C++ features.
2014-01-14 01:28:57 +00:00
Christopher Ferris
50fae736dc
am 1f71e465: am 68870199: Merge "Next phase of the move, reformat use C++ features."
...
* commit '1f71e465ef1544a2962299445dee03e6856ea54a':
Next phase of the move, reformat use C++ features.
2014-01-14 01:26:26 +00:00
Christopher Ferris
1f71e465ef
am 68870199: Merge "Next phase of the move, reformat use C++ features."
...
* commit '688701990db1aef2d7dbe0ccdc4f12c2dd5f51a8':
Next phase of the move, reformat use C++ features.
2014-01-13 17:24:13 -08:00
Christopher Ferris
688701990d
Merge "Next phase of the move, reformat use C++ features."
2014-01-14 01:18:20 +00:00
Elliott Hughes
bb07b536f5
Don't set LD_LIBRARY_PATH globally.
...
On a 64-bit system, 64-bit processes will want one path, 32-bit processes
another. The dynamic linker already provides the correct defaults for
native code, and we've coupled the VM and dynamic linker so that
LD_LIBRARY_PATH will be set correctly in any VM during startup if it's not
being manually overridden.
Change-Id: Icbffc0d451dbc242cdfb9267413d8bcac434e108
2014-01-13 16:49:54 -08:00
Nick Kralevich
da1f43f075
am 5b5b1f9b: am d896c195: am 45f3ed05: am 105f6b66: Merge "restorecon_recursive("/sys") speed boot time"
...
* commit '5b5b1f9b48f966942be3cda8d4ecfb7d910f12a0':
restorecon_recursive("/sys") speed boot time
2014-01-14 00:37:28 +00:00
Nick Kralevich
5b5b1f9b48
am d896c195: am 45f3ed05: am 105f6b66: Merge "restorecon_recursive("/sys") speed boot time"
...
* commit 'd896c195123716fb04ab6718e77fe0e5d1ab2bb9':
restorecon_recursive("/sys") speed boot time
2014-01-14 00:34:05 +00:00
Nick Kralevich
d896c19512
am 45f3ed05: am 105f6b66: Merge "restorecon_recursive("/sys") speed boot time"
...
* commit '45f3ed05c98d4e9cfc7b70a8c5f3af510afea8ee':
restorecon_recursive("/sys") speed boot time
2014-01-14 00:30:26 +00:00
Nick Kralevich
45f3ed05c9
am 105f6b66: Merge "restorecon_recursive("/sys") speed boot time"
...
* commit '105f6b6686ae1b2f6ae8ae81548cceb313fb2cee':
restorecon_recursive("/sys") speed boot time
2014-01-13 16:27:24 -08:00
Nick Kralevich
105f6b6686
Merge "restorecon_recursive("/sys") speed boot time"
2014-01-14 00:19:53 +00:00
Christopher Ferris
20303f856f
Next phase of the move, reformat use C++ features.
...
Use the libbacktrace C++ interface instead of the C interface in debuggerd.
Reformat the debuggerd code to be closer to Google C++ style.
Fix all debuggerd casts to be C++ casts.
Add a frame number to the frame data structure for ease of formatting and
add another FormatFrameData function.
Change the format_test to use the new FormatFrameData function.
Modify all of the backtrace_test to use the C++ interface.
Change-Id: I10e1610861acf7f4a3ad53276b74971cfbfda464
2014-01-13 14:21:52 -08:00
Colin Cross
ccfa8988bb
am 6f8ddbbb: am 3e8bb3ff: am e0e7595f: am e76343ef: Merge "Emerson USB ID"
...
* commit '6f8ddbbbe8ed2ff56a015f503f8d74431eb882dc':
Emerson USB ID
2014-01-12 07:20:13 +00:00
Colin Cross
6f8ddbbbe8
am 3e8bb3ff: am e0e7595f: am e76343ef: Merge "Emerson USB ID"
...
* commit '3e8bb3ff9ee1478c11408d7164ff7cb5d85f39d0':
Emerson USB ID
2014-01-12 07:16:38 +00:00
Colin Cross
3e8bb3ff9e
am e0e7595f: am e76343ef: Merge "Emerson USB ID"
...
* commit 'e0e7595f3c5e069e6b85973df6dbba39dcec0984':
Emerson USB ID
2014-01-12 07:13:56 +00:00
Colin Cross
e0e7595f3c
am e76343ef: Merge "Emerson USB ID"
...
* commit 'e76343ef72458aff8fdc25c57f4e84407c05a2f2':
Emerson USB ID
2014-01-11 23:09:48 -08:00
Colin Cross
e76343ef72
Merge "Emerson USB ID"
2014-01-12 07:05:04 +00:00
Jon Sawyer
6e39bace17
Emerson USB ID
...
Adds Emerson's USB id to the known USB Devices.
Change-Id: If6115c2551c1f30a5c190690f2aeaaf2adff7ee1
Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
2014-01-11 22:59:18 -08:00
Nick Kralevich
a613819a96
restorecon_recursive("/sys") speed boot time
...
Currently, the restorecon_recursive("/sys") call in
init.c takes approx 2 seconds on hammerhead. This change
reduces the delay to 1.2 seconds.
1) Avoid double stat call when using nftw (time savings
of 0.3 seconds)
2) Avoid the repeated calls to is_selinux_enabled() (time
savings of 0.5 seconds)
Avoid calling lsetfilecon if the file is already properly
labeled. This doesn't speed up the restorecon on /sys,
but it should help when handling files on /data.
Bug: 11640230
Change-Id: Ie212ce4f4acade208c5676d60c1f03f50e2388a4
2014-01-10 19:49:14 -08:00
Christopher Ferris
6e9c19906a
am c37fec6d: am 715752cd: am a7083e0d: am 8387fc93: Merge "Move to C++ for debuggerd."
...
* commit 'c37fec6d61dc2650a0a92983dc8d577f9e19520d':
Move to C++ for debuggerd.
2014-01-11 00:31:46 +00:00
Christopher Ferris
c37fec6d61
am 715752cd: am a7083e0d: am 8387fc93: Merge "Move to C++ for debuggerd."
...
* commit '715752cdbe5abb444f9c90769f7edb38ef52adb2':
Move to C++ for debuggerd.
2014-01-11 00:29:01 +00:00
Christopher Ferris
715752cdbe
am a7083e0d: am 8387fc93: Merge "Move to C++ for debuggerd."
...
* commit 'a7083e0dd29aa5102e25c5a978c072b0a2bf94f4':
Move to C++ for debuggerd.
2014-01-11 00:26:00 +00:00
Christopher Ferris
a7083e0dd2
am 8387fc93: Merge "Move to C++ for debuggerd."
...
* commit '8387fc938e044a2bf2840139203af7f9b3884029':
Move to C++ for debuggerd.
2014-01-10 16:23:39 -08:00
Christopher Ferris
8387fc938e
Merge "Move to C++ for debuggerd."
2014-01-11 00:19:56 +00:00
Christopher Ferris
d607495b89
Move to C++ for debuggerd.
...
This is part 1, only including the bare minimum changes because
our diff tool doesn't easily show differences when a file moves. This
also breaks it into a small chunk in case some other changes break things,
as unlikely as I think that will be.
Change-Id: Ib7a3e7a2cc1ac574d15b65fda23813ebcf5d31af
2014-01-10 16:05:12 -08:00
Mark Salyzyn
ec4ba22feb
Merge "liblog: Add README"
2014-01-10 23:11:11 +00:00