Ian Rogers
33dce382fd
am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support."
...
* commit '63a61e561d7d3d6f10488a194fb730f9edec3edc':
Rename __unused to __UNUSED for glibc support.
2014-06-29 23:05:58 +00:00
Ian Rogers
63a61e561d
Merge "Rename __unused to __UNUSED for glibc support."
2014-06-28 00:06:36 +00:00
Ian Rogers
de8b983357
Rename __unused to __UNUSED for glibc support.
...
Glibc declares unused fields as __unused and so a #define for __unused causes
issues when we built against glibc on the host. Rename __unused to __UNUSED as
a workaround.
This fixed checkbuild for 64-bit host builds. Bug: 13751317
Change-Id: Ic2cd52518c16661497cc819cb3fd7f1fa5c6f0fb
2014-06-27 17:40:32 -07:00
Mark Salyzyn
ac4efdd2b4
am 0a350f4f: Merge "debuggerd: synchronize cosmetics to internal"
...
* commit '0a350f4f0857cd4a42b5099b8fda7766a35398cb':
debuggerd: synchronize cosmetics to internal
2014-06-27 23:22:13 +00:00
Elliott Hughes
6f185dea32
am e080be57: Merge "Fixed tid/pid mixup in debuggerd gdbclient output."
...
* commit 'e080be575419e77c909b54791ea2b44467a1a913':
Fixed tid/pid mixup in debuggerd gdbclient output.
2014-06-27 18:34:23 +00:00
Mark Salyzyn
44029223da
am c8a7e34d: Merge "tombstone: log output header suppressed in crash"
...
* commit 'c8a7e34dfc0f8f1c994168672db21175b28b931f':
tombstone: log output header suppressed in crash
2014-06-27 18:06:06 +00:00
Mark Salyzyn
0a350f4f08
Merge "debuggerd: synchronize cosmetics to internal"
2014-06-27 16:59:53 +00:00
Mark Salyzyn
17e85c0671
debuggerd: synchronize cosmetics to internal
...
Change-Id: I66bc2b181cd75da188c046571492224d5ac3fc98
2014-06-27 15:55:19 -07:00
Mark Salyzyn
c8a7e34dfc
Merge "tombstone: log output header suppressed in crash"
2014-06-27 16:00:43 +00:00
Mark Salyzyn
e43290d7ed
tombstone: log output header suppressed in crash
...
Bug: 15520846
Change-Id: I18934cc60af3dda98ab729fbabc4c7a66834512e
2014-06-27 10:32:22 -07:00
Riley Andrews
23340d8ada
am 10f8cd1d: Merge changes Ia15b2110,I5498c725
...
* commit '10f8cd1d87eccde36da2ac54ad7d390e34a6e224':
Add ability to adjust init log level at runtime.
Improve init's debug printing.
2014-06-27 03:40:01 +00:00
Elliott Hughes
e080be5754
Merge "Fixed tid/pid mixup in debuggerd gdbclient output."
2014-06-26 18:34:59 +00:00
Brigid Smith
75582957cf
Fixed tid/pid mixup in debuggerd gdbclient output.
...
Now the debugging output shows the tid of the crashed thread instead of
the pid of the process that crashed.
Change-Id: I637f409ff02d73d458edc6d1a5c462c21d128211
2014-06-27 09:21:12 -07:00
Riley Andrews
10f8cd1d87
Merge changes Ia15b2110,I5498c725
...
* changes:
Add ability to adjust init log level at runtime.
Improve init's debug printing.
2014-06-26 17:56:55 +00:00
Riley Andrews
1bbef88e80
Add ability to adjust init log level at runtime.
...
+ Add a new property, sys.init_log_level, which can be set after init
bootstrap. This will control the level at which init does prints to klog.
Change-Id: Ia15b2110157b5e6b713785ece9b0fb94889be6c8
2014-06-26 15:05:20 -07:00
Riley Andrews
24a3b783d5
Improve init's debug printing.
...
+ Make prints of rc commands significantly more verbose. All commands
will log all arguments, file/line number of the command, return value,
and parent action which triggered the command.
init: command 'mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000' action=init
status=0 (/init.rc:89)
init: command 'setprop net.tcp.default_init_rwnd 60' action=boot status=0
(/init.rc:403)
Change-Id: I5498c7258e4891706be4a12546df4231d14d86c4
2014-06-26 15:05:15 -07:00
Narayan Kamath
10e36e8087
am a42d5bf0: Merge "pixelflinger: Use pointer arithmetic to determine cache flush parameters"
...
* commit 'a42d5bf0064e8c8ce50b22abe13bb6eed4ea9dac':
pixelflinger: Use pointer arithmetic to determine cache flush parameters
2014-06-26 12:24:47 +00:00
Nick Kralevich
3a3b12c2a1
am 64f5fe27: Merge "property_service: get rid of hard coded property / control list"
...
* commit '64f5fe2796c5d20e0b1069837cac269f4aade331':
property_service: get rid of hard coded property / control list
2014-06-26 04:34:10 +00:00
Elliott Hughes
fdd4ffd182
am 01ad7710: Merge "Fix %llx to PRIx64 in nandread.c."
...
* commit '01ad77107bfdc641ad818fe452448f0887aef961':
Fix %llx to PRIx64 in nandread.c.
2014-06-26 00:13:32 +00:00
Nick Kralevich
64f5fe2796
Merge "property_service: get rid of hard coded property / control list"
2014-06-25 17:34:34 +00:00
Elliott Hughes
01ad77107b
Merge "Fix %llx to PRIx64 in nandread.c."
2014-06-25 17:34:27 +00:00
Elliott Hughes
a5f28628b1
Fix %llx to PRIx64 in nandread.c.
...
Change-Id: I541d1f4efac3c91d1a26f60735c72e799490fcc9
2014-06-25 16:37:18 -07:00
Nick Kralevich
aadf9f11db
am 4ad20e55: Merge "Redirect libselinux logging to dmesg for ueventd."
...
* commit '4ad20e55e5a5d2acbecd564523f47056d3156638':
Redirect libselinux logging to dmesg for ueventd.
2014-06-25 17:23:42 +00:00
Ian Rogers
c309b97eb1
am e4022279: Merge "libbacktrace_libc++ needs to be multilib on the Mac too."
...
* commit 'e4022279e192f08c5110896917403c5eea40e151':
libbacktrace_libc++ needs to be multilib on the Mac too.
2014-06-25 05:08:27 +00:00
Nick Kralevich
4ad20e55e5
Merge "Redirect libselinux logging to dmesg for ueventd."
2014-06-25 03:39:25 +00:00
Ian Rogers
e4022279e1
Merge "libbacktrace_libc++ needs to be multilib on the Mac too."
2014-06-25 03:39:25 +00:00
Ian Rogers
c132aaf0c3
libbacktrace_libc++ needs to be multilib on the Mac too.
...
Change-Id: I2053345253c1d57c3485b790163ba0b4b10cc326
2014-06-24 21:57:55 -07:00
Michael Wright
3888cefc4d
am 949bd4c2: Merge "Print ABI in backtraces."
...
* commit '949bd4c208fb9e2ccea2cb0ed76fafef7a5cecea':
Print ABI in backtraces.
2014-06-25 01:49:18 +00:00
Michael Wright
949bd4c208
Merge "Print ABI in backtraces."
2014-06-25 01:41:06 +00:00
Michael Wright
80f596984e
Print ABI in backtraces.
...
This lets the stack tool figure out which toolchain to use
automatically.
Change-Id: Ia235d6904622423fe6fbc7b0315a1861e52a41ad
2014-06-24 17:14:26 -07:00
JP Abgrall
311321820b
am 07703339: Merge "Wait for device to disappear after "fastboot reboot"."
...
* commit '077033391bf9dc9c73bbcebf011fc63a6501674b':
Wait for device to disappear after "fastboot reboot".
2014-06-24 22:41:31 +00:00
Elliott Hughes
b193986452
am c4a09654: Merge "Fixed pathname for connecting to debugger."
...
* commit 'c4a09654cc2c91ad27f7d29d4584bec58d75e9f8':
Fixed pathname for connecting to debugger.
2014-06-24 18:25:08 +00:00
Stephen Smalley
439224e275
Redirect libselinux logging to dmesg for ueventd.
...
We already do this for init, but had failed to do it for ueventd
and could not capture any logging from libselinux calls made by
ueventd.
Truly enabling non-error logging also requires uncommenting a line
in Android.mk:
LOCAL_CFLAGS += -DLOG_UEVENTS=1
which enables other logging and sets the default log level to INFO,
or otherwise changing the klog level in the ueventd code (is not
settable by init.rc loglevel).
Change-Id: I00e6f9d6271f2a21d9078c96368816d74d6d2850
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-06-24 14:11:59 -04:00
Christopher Ferris
5450a4415c
am 676f3755: Merge "Add android_memset16/android_memset32 for aarch64."
...
* commit '676f37554d7bfdb33dfd4420ff82c73cc581b1bd':
Add android_memset16/android_memset32 for aarch64.
2014-06-24 17:28:37 +00:00
Elliott Hughes
d08b80ccc6
am 20bda70f: Merge "Add Smartisan usb config"
...
* commit '20bda70f9a8dff764bcbad3e711a91700fc6346b':
Add Smartisan usb config
2014-06-24 16:09:21 +00:00
Narayan Kamath
a42d5bf006
Merge "pixelflinger: Use pointer arithmetic to determine cache flush parameters"
2014-06-24 06:33:30 +00:00
Christopher Ferris
676f37554d
Merge "Add android_memset16/android_memset32 for aarch64."
2014-06-24 00:22:15 +00:00
Christopher Ferris
d660d895c1
Add android_memset16/android_memset32 for aarch64.
...
Included new unit tests for these functions.
Bug: 15456369
Change-Id: I3fac02f61c62d15d54d0df51957680d7155e98ae
2014-06-23 19:28:33 -07:00
JP Abgrall
077033391b
Merge "Wait for device to disappear after "fastboot reboot"."
2014-06-23 21:50:22 +00:00
Mark Wachsler
ec25e7bc4b
Wait for device to disappear after "fastboot reboot".
...
This is a follow-up to commit 157b00171a .
After "fastboot reboot", "fastboot devices" was still showing the device as
connected even though it was starting to reboot; now "fastboot reboot" will
wait until the device has disconnected.
The wait timeout is 3 seconds.
Change-Id: I8066741f0be91e53f3e3f5bc968bc1b9de31db05
2014-06-24 22:34:34 +00:00
Elliott Hughes
c4a09654cc
Merge "Fixed pathname for connecting to debugger."
2014-06-23 21:50:22 +00:00
Brigid Smith
20c214f857
Fixed pathname for connecting to debugger.
...
The debug output was still showing the pathname that worked with
gdbclient before my changes, and therefore did not work after the fact.
Change-Id: Ie12d79f5346088914ce0a70bda69780707b31d31
2014-06-24 10:04:41 -07:00
Elliott Hughes
20bda70f9a
Merge "Add Smartisan usb config"
2014-06-23 21:50:22 +00:00
Riley Andrews
5b45e08aab
am 7950fc47: Merge "Add ability to boot from charger mode."
...
* commit '7950fc47a76cf7fe2d5c5e1a25002cb7848cf155':
Add ability to boot from charger mode.
2014-06-23 21:35:48 +00:00
Elliott Hughes
2c2fdae754
am 633be1f3: Merge "Remove android_atomic_swap from mips & mips64."
...
* commit '633be1f37e11703be90fc2c900f548a68b8c86d7':
Remove android_atomic_swap from mips & mips64.
2014-06-23 20:15:43 +00:00
Elliott Hughes
ba46782770
am 29705171: Merge "[MIPS64] add atomic-mips64"
...
* commit '29705171325ad923df478e41b94af812990764cd':
[MIPS64] add atomic-mips64
2014-06-23 19:44:23 +00:00
Elliott Hughes
e09c8a06a2
am e1f17ebb: Merge "Fixing debuggerd header output."
...
* commit 'e1f17ebb7c0bd16c9bc48e0fae018e26e75e7d7f':
Fixing debuggerd header output.
2014-06-23 19:44:22 +00:00
Brigid Smith
f473200d35
Fixing debuggerd header output.
...
PID and TID output line was missing.
Change-Id: I609af5727bc22ea0b97f3975ddb3cf0102910bc2
2014-06-23 11:03:40 -07:00
Riley Andrews
7950fc47a7
Merge "Add ability to boot from charger mode."
2014-06-23 14:50:49 +00:00
Elliott Hughes
633be1f37e
Merge "Remove android_atomic_swap from mips & mips64."
2014-06-23 14:50:49 +00:00