Christopher Ferris
14b964f52e
am e6ed63e6: am c9c401e6: Merge "Move map data into backtrace data proper."
...
* commit 'e6ed63e610c5e6a56b04a5168e873dfa48c73aec':
Move map data into backtrace data proper.
2015-02-09 04:13:37 +00:00
Elliott Hughes
bc32de07e9
am b164b103: am 5e753100: Merge "Clean up reading and writing in init."
...
* commit 'b164b103ebdcb2b567079f30e38d878a21a9b632':
Clean up reading and writing in init.
2015-02-09 04:13:02 +00:00
Christopher Ferris
e6ed63e610
am c9c401e6: Merge "Move map data into backtrace data proper."
...
* commit 'c9c401e64ba00e8fa295cae30b2b0035fae1183a':
Move map data into backtrace data proper.
2015-02-06 23:43:11 +00:00
Christopher Ferris
c9c401e64b
Merge "Move map data into backtrace data proper."
2015-02-06 23:29:00 +00:00
Christopher Ferris
12385e3ad0
Move map data into backtrace data proper.
...
The backtrace structure used to include a pointer to a backtrace_map_t
that represented the map data for a particular pc. This introduced a
race condition where the pointer could be discarded, but the backtrace
structure still contained a pointer to garbage memory. Now all of the map
information is right in the structure.
Bug: 19028453
Change-Id: If7088a73f3c6bf1f3bc8cdd2bb4b62e7cab831c0
2015-02-06 15:00:09 -08:00
Elliott Hughes
b164b103eb
am 5e753100: Merge "Clean up reading and writing in init."
...
* commit '5e753100c32c7b42ae4306a8023c419defd34c4e':
Clean up reading and writing in init.
2015-02-06 22:33:18 +00:00
Elliott Hughes
5e753100c3
Merge "Clean up reading and writing in init."
2015-02-06 22:22:30 +00:00
Elliott Hughes
f682b4786a
Clean up reading and writing in init.
...
This isn't particularly useful in and of itself, but it does introduce the
first (trivial) unit test, improves the documentation (including details
about how to debug init crashes), and made me aware of how unpleasant the
existing parser is.
I also fixed a bug in passing --- unless you thought the "peboot" and "pm"
commands were features...
Bug: 19217569
Change-Id: I6ab76129a543ce3ed3dab52ef2c638009874c3de
2015-02-06 14:20:30 -08:00
Nick Kralevich
8c6178960d
am 846c8e0d: am 17b5b352: Merge "fs_mgr: error check umount calls / add retry logic"
...
* commit '846c8e0d34ab15de84adc462440f2e95f53ac863':
fs_mgr: error check umount calls / add retry logic
2015-02-06 20:41:20 +00:00
Nick Kralevich
846c8e0d34
am 17b5b352: Merge "fs_mgr: error check umount calls / add retry logic"
...
* commit '17b5b3520094de679c9e43a872c02d15758c83b8':
fs_mgr: error check umount calls / add retry logic
2015-02-06 20:34:57 +00:00
Nick Kralevich
17b5b35200
Merge "fs_mgr: error check umount calls / add retry logic"
2015-02-06 20:27:12 +00:00
Christopher Ferris
0051223e9a
am a242b4e1: am 62894122: Merge "Remove link to gccdemangle."
...
* commit 'a242b4e1b0d9d22d3abd2e013cde1a2d2676c236':
Remove link to gccdemangle.
2015-02-06 16:48:39 +00:00
Nick Kralevich
7294eb6cae
fs_mgr: error check umount calls / add retry logic
...
Don't silently ignore umount errors. At a minimum, log them.
Add strerror(errno) to another umount call, to make sure we get
some actionable data.
check_fs: try 5 times umounting the filesystem. It appears that
the umount is failing, perhaps because some service is opening
the file on the device or other error. Try unmounting it multiple
times in case it's a transient problem and we can recover.
Bug: 19199624
Bug: 19156134
Change-Id: I7213eb52d55116fb2419a36494d26d5e159981a7
2015-02-05 20:50:22 -08:00
Christopher Ferris
a242b4e1b0
am 62894122: Merge "Remove link to gccdemangle."
...
* commit '6289412222bfe26ebeef2ea9c422e828c11ffc30':
Remove link to gccdemangle.
2015-02-06 04:23:39 +00:00
Christopher Ferris
6289412222
Merge "Remove link to gccdemangle."
2015-02-06 04:11:47 +00:00
Christopher Ferris
2a176a89c2
Remove link to gccdemangle.
...
Bug: 18930951
Change-Id: Ib7fd332b6e02241c0676ef33d2fa210a72efe1b1
2015-02-05 19:33:11 -08:00
Greg Hackmann
0c713b5243
am 86cdce1a: am f52338fe: Merge "rootdir: enable armv8_deprecated swp hook"
...
* commit '86cdce1aab39ddbb346e6f7be1ca86531970419f':
rootdir: enable armv8_deprecated swp hook
2015-02-05 23:31:32 +00:00
Greg Hackmann
86cdce1aab
am f52338fe: Merge "rootdir: enable armv8_deprecated swp hook"
...
* commit 'f52338fe1e8f74123a895db591d6a2a53061a2b1':
rootdir: enable armv8_deprecated swp hook
2015-02-05 23:21:19 +00:00
Greg Hackmann
f52338fe1e
Merge "rootdir: enable armv8_deprecated swp hook"
2015-02-05 23:09:14 +00:00
Greg Hackmann
cee8757f92
rootdir: enable armv8_deprecated swp hook
...
The upstream kernel now includes support for emulating legacy AArch32
instructions on ARMv8 devices. By default this framework emulates
deprecated instructions but not obsolete instructions.
Android requires support for the obsolete SWP and SWPB instructions on
all ARM devices, so override this default for the swp emulation hook.
Change-Id: I82b9bdb564413ec7c1a101da75a9928aebe1606b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-02-05 13:38:58 -08:00
Elliott Hughes
07e0ee7cf4
am dcbeb41a: am d558530b: Merge "Fix Windows build."
...
* commit 'dcbeb41a673e3fa6eb8344e9c806cb8a5f7eeff5':
Fix Windows build.
2015-02-05 20:15:04 +00:00
Elliott Hughes
7a73b2eecd
am 984e01e5: am 6c3ff4fe: Merge "Fix Windows build."
...
* commit '984e01e54ebaab5d413b80661e1311be2c15b464':
Fix Windows build.
2015-02-05 20:15:03 +00:00
Elliott Hughes
de290beddd
am 05d8a22c: am 051f369a: Merge "Build BSD grep separately from toolbox."
...
* commit '05d8a22c2d75e8945e372ef0bb251fabb055a3df':
Build BSD grep separately from toolbox.
2015-02-05 20:15:01 +00:00
Elliott Hughes
dcbeb41a67
am d558530b: Merge "Fix Windows build."
...
* commit 'd558530ba90cb6218fe8e255c71a034c3fe1ea58':
Fix Windows build.
2015-02-05 18:51:07 +00:00
Elliott Hughes
984e01e54e
am 6c3ff4fe: Merge "Fix Windows build."
...
* commit '6c3ff4fe7f0b1cd729bf61974dde845b611b99c0':
Fix Windows build.
2015-02-05 18:47:24 +00:00
Elliott Hughes
05d8a22c2d
am 051f369a: Merge "Build BSD grep separately from toolbox."
...
* commit '051f369a14a405dc6dbaf708dc51a21c5629bf88':
Build BSD grep separately from toolbox.
2015-02-05 18:47:23 +00:00
Paul McLean
9d13e782c6
Merge "Adding name field to AudioPort for enum/select API."
2015-02-05 18:13:48 +00:00
Elliott Hughes
d558530ba9
Merge "Fix Windows build."
2015-02-05 16:23:41 +00:00
Elliott Hughes
d79801d60d
Fix Windows build.
...
Take 2. Probably should have done this in the beginning, but thought I was
being clever.
Change-Id: I85c6e487eece9bcc75f8f62c850c2d4d1ee9e908
2015-02-05 08:21:37 -08:00
Elliott Hughes
6c3ff4fe7f
Merge "Fix Windows build."
2015-02-05 03:40:07 +00:00
Elliott Hughes
31fa09c1c6
Fix Windows build.
...
Only two days in, and I'm already really regretting putting this code
somewhere that builds for Mac OS and Windows...
Change-Id: I576ee4a9e647e10dc2d47c7e1e38aedee2bf404c
2015-02-04 19:38:28 -08:00
Elliott Hughes
051f369a14
Merge "Build BSD grep separately from toolbox."
2015-02-05 03:36:07 +00:00
Elliott Hughes
d20218e05d
Build BSD grep separately from toolbox.
...
Also move the dd-only library code into the dd section (so a future
maintainer will know to keep/remove them as a block) and fix the one
build warning remaining.
Change-Id: Ibf6b28ef05e4cbb70b9308b0f4387f5af5b7fa94
2015-02-04 18:50:14 -08:00
Elliott Hughes
a72dfdc07a
am b936dfcd: am 1dee489c: Merge "Stop using #if for conditional compilation."
...
* commit 'b936dfcdbf0e5677593e3c2758180beb2d7078fb':
Stop using #if for conditional compilation.
2015-02-05 02:36:49 +00:00
Elliott Hughes
495952fef2
am 44fdd5d1: am 27d28d3b: Merge "Add a WriteStringToFile overload that cares about permissions."
...
* commit '44fdd5d15a8851e4053af168e7235b30a5f4d34d':
Add a WriteStringToFile overload that cares about permissions.
2015-02-05 02:36:47 +00:00
Elliott Hughes
b936dfcdbf
am 1dee489c: Merge "Stop using #if for conditional compilation."
...
* commit '1dee489ceaa9dfb6b6609f97380f20b0753eb2c1':
Stop using #if for conditional compilation.
2015-02-05 02:31:32 +00:00
Elliott Hughes
44fdd5d15a
am 27d28d3b: Merge "Add a WriteStringToFile overload that cares about permissions."
...
* commit '27d28d3baff860d1fd936a5fcf2d920577c52575':
Add a WriteStringToFile overload that cares about permissions.
2015-02-05 02:31:31 +00:00
Elliott Hughes
1dee489cea
Merge "Stop using #if for conditional compilation."
2015-02-05 01:16:29 +00:00
Elliott Hughes
c0e919c920
Stop using #if for conditional compilation.
...
Use regular 'if' to prevent bitrot.
Also remove remaining typedefs.
Change-Id: I2e6ca928e2db29b88b643cf990ff05cfb0be94a6
2015-02-04 17:16:11 -08:00
Elliott Hughes
27d28d3baf
Merge "Add a WriteStringToFile overload that cares about permissions."
2015-02-04 22:43:02 +00:00
Elliott Hughes
202f024dee
Add a WriteStringToFile overload that cares about permissions.
...
Change-Id: I857a80b61768d4e9610bdd149eff2d9d8e48d2c0
2015-02-04 14:30:23 -08:00
Elliott Hughes
5caa5418a4
am f86b0496: am aec43a12: Merge "Use TEMP_FAILURE_RETRY, always build bootchart.cpp."
...
* commit 'f86b0496b5c1a7f8bdd841c6979df8061eeef150':
Use TEMP_FAILURE_RETRY, always build bootchart.cpp.
2015-02-04 18:59:40 +00:00
Elliott Hughes
b7889e2685
am 7d3b4846: am 798219e9: Merge "Fix clang "ueventd.cpp:111:1: error: no return statement in function returning non-void"."
...
* commit '7d3b4846902dbac3903146638b2eace56d0c7dc3':
Fix clang "ueventd.cpp:111:1: error: no return statement in function returning non-void".
2015-02-04 18:59:37 +00:00
Elliott Hughes
0161184957
am 19fbf945: am e939e704: Merge "Build init as C++."
...
* commit '19fbf945abaa8d9d605f662ddc5f64f3e1865b23':
Build init as C++.
2015-02-04 18:59:20 +00:00
Mark Salyzyn
e926c08195
am d7839f9e: am 04b30a06: Merge "logd: logd placed into background cgroup"
...
* commit 'd7839f9e098d39389fd9100cdab308d17ef15121':
logd: logd placed into background cgroup
2015-02-04 18:58:47 +00:00
Elliott Hughes
f86b0496b5
am aec43a12: Merge "Use TEMP_FAILURE_RETRY, always build bootchart.cpp."
...
* commit 'aec43a12a76160e924fc0af9b131bd385cf7a60c':
Use TEMP_FAILURE_RETRY, always build bootchart.cpp.
2015-02-04 18:45:23 +00:00
Elliott Hughes
7d3b484690
am 798219e9: Merge "Fix clang "ueventd.cpp:111:1: error: no return statement in function returning non-void"."
...
* commit '798219e9e9137db272585f5dc5683df91ed5beb1':
Fix clang "ueventd.cpp:111:1: error: no return statement in function returning non-void".
2015-02-04 18:38:16 +00:00
Elliott Hughes
aec43a12a7
Merge "Use TEMP_FAILURE_RETRY, always build bootchart.cpp."
2015-02-04 18:37:32 +00:00
Elliott Hughes
24627906bf
Use TEMP_FAILURE_RETRY, always build bootchart.cpp.
...
Also switch the revision parsing over to sscanf as promised. I haven't
done the hardware parsing because I don't yet know whether we actually need
to keep the space-stripping code.
Change-Id: Ic33378345cd515cb08d00c543acf44eb72673396
2015-02-04 10:25:09 -08:00
Elliott Hughes
798219e9e9
Merge "Fix clang "ueventd.cpp:111:1: error: no return statement in function returning non-void"."
2015-02-04 18:20:33 +00:00