Elliott Hughes
c97d38a5fd
am c1c1c827: am 710f6634: Merge "Switch mips libcorkscrew over to <sys/ucontext.h>."
...
* commit 'c1c1c8272860225a066d4365e9ebe87a753405b3':
Switch mips libcorkscrew over to <sys/ucontext.h>.
2014-01-31 16:41:12 +00:00
Ian Rogers
f312814060
am c9869057: am 1ca10eab: Merge "Avoid redefinition of __STDC_FORMAT_MACROS."
...
* commit 'c98690576ab6d7d13e5c0d3387db8149de71d9de':
Avoid redefinition of __STDC_FORMAT_MACROS.
2014-01-31 16:41:11 +00:00
Elliott Hughes
7d6aed2c77
am 84ba6b52: am 59b5294f: Merge "Switch arm libcorkscrew over to <sys/ucontext.h>."
...
* commit '84ba6b52b22e91cade601b28dd4c630a1f1d4b70':
Switch arm libcorkscrew over to <sys/ucontext.h>.
2014-01-31 16:41:10 +00:00
Elliott Hughes
174d06f6e4
am 4d0520fb: am b99d5294: Merge "Switch x86 libcorkscrew over to <ucontext.h>."
...
* commit '4d0520fbc92f4bfead3b87890ae9af6dcf3be0ab':
Switch x86 libcorkscrew over to <ucontext.h>.
2014-01-31 16:41:09 +00:00
Glenn Kasten
c0a51093a2
Add 24-bit packed to audio_format_t
...
Change-Id: I08c38ee3ade7b24dc9e2b3ed2b7037c42521a555
2014-01-31 07:51:17 -08:00
Elliott Hughes
480fdd524d
am e97dad0d: Merge "debuggerd: a few generic improvements"
...
* commit 'e97dad0d95ae1305686bf4294029da947fc2dcf2':
debuggerd: a few generic improvements
2014-01-31 13:00:38 +00:00
Elliott Hughes
7dc91f8cfa
am 8623972d: Merge "Don\'t try to build libcorkscrew for LP64."
...
* commit '8623972dc0055ae878df24cf93a663e60a6787f1':
Don't try to build libcorkscrew for LP64.
2014-01-31 13:00:37 +00:00
Elliott Hughes
e5734557d9
am caefe564: Merge "x86: Enable libunwind"
...
* commit 'caefe564a4b05e717a3baec155b8968ad36e58b6':
x86: Enable libunwind
2014-01-31 12:17:16 +00:00
Christopher Ferris
cbe55724c8
am 7957529d: Merge "Clean up UnwindCurrent.cpp\'s use of ucontext.h."
...
* commit '7957529d4419fa92928daebfdc5f5bb1ee50120a':
Clean up UnwindCurrent.cpp's use of ucontext.h.
2014-01-31 12:17:15 +00:00
Colin Cross
1c75422c21
am 1686784a: Merge changes I6bffe1cd,I0984ba01
...
* commit '1686784a37848fa985258f3f87cf6835f1c8cf0e':
fs_mgr: split fstab parsing into separate file
fs_mgr: update ext4_parse_sb to match change in ext4_utils
2014-01-31 10:27:04 +00:00
Elliott Hughes
c1c1c82728
am 710f6634: Merge "Switch mips libcorkscrew over to <sys/ucontext.h>."
...
* commit '710f66342591c889b0bf545ff3c578731f112a6b':
Switch mips libcorkscrew over to <sys/ucontext.h>.
2014-01-31 10:27:02 +00:00
Ian Rogers
c98690576a
am 1ca10eab: Merge "Avoid redefinition of __STDC_FORMAT_MACROS."
...
* commit '1ca10eabd84e13e2c71d56ef48218bc981f79497':
Avoid redefinition of __STDC_FORMAT_MACROS.
2014-01-31 10:27:00 +00:00
Elliott Hughes
84ba6b52b2
am 59b5294f: Merge "Switch arm libcorkscrew over to <sys/ucontext.h>."
...
* commit '59b5294f0ead4f50dbd3b45b6602d145cf9d3afd':
Switch arm libcorkscrew over to <sys/ucontext.h>.
2014-01-31 10:26:59 +00:00
Elliott Hughes
4d0520fbc9
am b99d5294: Merge "Switch x86 libcorkscrew over to <ucontext.h>."
...
* commit 'b99d52944f61aebdac427a490bfed2ae8cccbc10':
Switch x86 libcorkscrew over to <ucontext.h>.
2014-01-31 10:26:58 +00:00
Elliott Hughes
51c4d4c431
Merge "AArch64: Port debuggerd"
2014-01-31 02:05:45 +00:00
Kévin PETIT
abc60c26b7
AArch64: Port debuggerd
...
Change-Id: Ib18f76f375a1d70c84e0a09d221e17ac43144b96
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-30 18:05:03 -08:00
Elliott Hughes
e94985a251
Merge "Increase the scope of other reused definitions."
2014-01-31 01:52:17 +00:00
Elliott Hughes
ba0cecf8e3
Increase the scope of other reused definitions.
...
(Testing this in a non-x86 tree, as I'd been doing, was no testing at all.)
Change-Id: I6c5d08e9d566554c212feb8499238aeadf877dad
2014-01-30 17:51:18 -08:00
Elliott Hughes
5434bf6640
Merge "LP64: Enable debuggerd/libbacktrace/libunwind."
2014-01-31 01:48:16 +00:00
Elliott Hughes
469f15339d
Merge "Fix build by defining LOCAL_PATH early enough."
2014-01-31 01:39:50 +00:00
Elliott Hughes
bf857aeae3
Fix build by defining LOCAL_PATH early enough.
...
Change-Id: I959b04e5539d6f24ce96cd6737434f932d717e1b
2014-01-30 17:39:22 -08:00
Pavel Chupin
c6c194ced0
LP64: Enable debuggerd/libbacktrace/libunwind.
...
Change-Id: I2e432839f86c33c2adbaac8cc12ca8961956044b
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2014-01-30 17:15:24 -08:00
Elliott Hughes
525155ac49
Merge "Allow the host libcorkscrew to build."
2014-01-31 00:39:54 +00:00
Elliott Hughes
fe4d68b6ed
Allow the host libcorkscrew to build.
...
Change-Id: Iabe82720d3261a9bd35763c260d3c4b6d422e287
2014-01-30 16:39:22 -08:00
Elliott Hughes
e97dad0d95
Merge "debuggerd: a few generic improvements"
2014-01-30 23:56:55 +00:00
Kévin PETIT
4bb477205a
debuggerd: a few generic improvements
...
This one makes dump_memory reasonably architecture-agnostic so it is
possible to share the code between architectures.
It also includes a few small improvements in tombstone.cpp.
Change-Id: Ib8a9599bfa420b41e80207988e87aee1b9d79541
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-30 15:55:33 -08:00
Elliott Hughes
8623972dc0
Merge "Don't try to build libcorkscrew for LP64."
2014-01-30 23:15:42 +00:00
Elliott Hughes
d5aff0a6fa
Don't try to build libcorkscrew for LP64.
...
Change-Id: I77e36b83048b40ba53b6790b7c31beac27feee56
2014-01-30 14:43:42 -08:00
Elliott Hughes
caefe564a4
Merge "x86: Enable libunwind"
2014-01-30 19:01:30 +00:00
Pavel Chupin
c124402f39
x86: Enable libunwind
...
Change-Id: I098787f57801f68d0419732d5fd475c7e916c92c
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2014-01-30 11:00:38 -08:00
Christopher Ferris
7957529d44
Merge "Clean up UnwindCurrent.cpp's use of ucontext.h."
2014-01-30 18:47:24 +00:00
Christopher Ferris
5c40019a92
Clean up UnwindCurrent.cpp's use of ucontext.h.
...
Change-Id: I9eff7486b9fe89eac57b5555649b871bc6f1cc77
2014-01-30 10:37:39 -08:00
Colin Cross
1686784a37
Merge changes I6bffe1cd,I0984ba01
...
* changes:
fs_mgr: split fstab parsing into separate file
fs_mgr: update ext4_parse_sb to match change in ext4_utils
2014-01-30 04:00:11 +00:00
Elliott Hughes
710f663425
Merge "Switch mips libcorkscrew over to <sys/ucontext.h>."
2014-01-30 02:47:16 +00:00
Elliott Hughes
ade9afac20
Switch mips libcorkscrew over to <sys/ucontext.h>.
...
Change-Id: I4db233fb85c8f0b0c210771a8c75ae8e67dff96f
2014-01-29 18:38:49 -08:00
Ian Rogers
1ca10eabd8
Merge "Avoid redefinition of __STDC_FORMAT_MACROS."
2014-01-30 02:06:12 +00:00
Elliott Hughes
59b5294f0e
Merge "Switch arm libcorkscrew over to <sys/ucontext.h>."
2014-01-30 02:04:28 +00:00
Ian Rogers
ddeb7cc164
Avoid redefinition of __STDC_FORMAT_MACROS.
...
Change-Id: I5c65ea196bb9a197a74899ceb53543f289f6d494
2014-01-29 17:53:50 -08:00
Elliott Hughes
03a2597c31
Switch arm libcorkscrew over to <sys/ucontext.h>.
...
Change-Id: I90cf89453f2718fd4bec2bf17ea616ee8165d36a
2014-01-29 17:52:56 -08:00
Elliott Hughes
b99d52944f
Merge "Switch x86 libcorkscrew over to <ucontext.h>."
2014-01-30 01:39:34 +00:00
Elliott Hughes
3aa8675aa1
Switch x86 libcorkscrew over to <ucontext.h>.
...
Change-Id: I9fa536ea25f7e2d953488b0d317d8a5237b43d03
2014-01-29 17:29:46 -08:00
Stephen Smalley
82e87ed479
Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
...
mkdir /data/misc/wifi subdirectories and /data/misc/dhcp is performed
in the various device-specific init*.rc files but seems generic.
Move it to the main init.rc file.
Drop the separate chown for /data/misc/dhcp as this is handled by mkdir
built-in if the directory already exists.
Add a restorecon_recursive /data/misc/wifi/sockets.
Change-Id: I51b09c5e40946673a38732ea9f601b2d047d3b62
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-01-29 14:09:28 -05:00
Mike Lockwood
5df1e320c7
Merge "libusbhost: Add usb_device_set_configuration and usb_device_set_interface"
2014-01-29 18:09:38 +00:00
Christopher Ferris
cc98fd7eb2
am ab2de415: am 773c9ab7: am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."
...
* commit 'ab2de41574d15bac8c3ef8f49cfba493ea501a0a':
Fix global pointing to local variable.
2014-01-29 12:49:39 +00:00
Kristian Monsen
f6b714ba61
am da0d5bd1: am a40636f3: am 5abe06bf: am 6e34793b: Merge "Fix code style, put unused in the end"
...
* commit 'da0d5bd147dfd87280b1924abfc3650d5306448d':
Fix code style, put unused in the end
2014-01-29 12:20:41 +00:00
Christopher Ferris
96a0bf1e94
am 36a4e408: am aaf89887: am 6fe31b2f: am d391c9b4: Merge "Re-enable libunwind for arm."
...
* commit '36a4e4085e55048ee2a78c7d5b50f7395e547fa2':
Re-enable libunwind for arm.
2014-01-29 12:19:59 +00:00
Christopher Ferris
ab2de41574
am 773c9ab7: am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."
...
* commit '773c9ab74cc2e42f25fe16756e0b7a693b1d2cf5':
Fix global pointing to local variable.
2014-01-29 08:15:40 +00:00
Christopher Ferris
773c9ab74c
am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."
...
* commit 'c96c29548fa0c933e5aa78116f90ff6be5c4fc39':
Fix global pointing to local variable.
2014-01-29 08:11:02 +00:00
Christopher Ferris
c96c29548f
am a152ed73: Merge "Fix global pointing to local variable."
...
* commit 'a152ed734f179ee2748d306f2eb57acbb4df1ace':
Fix global pointing to local variable.
2014-01-29 08:07:27 +00:00
Christopher Ferris
a152ed734f
Merge "Fix global pointing to local variable."
2014-01-29 06:29:58 +00:00