summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am c9c401e6: Merge "Move map data into backtrace data proper."Christopher Ferris2015-02-0611-43/+65
|\ | | | | | | | | * commit 'c9c401e64ba00e8fa295cae30b2b0035fae1183a': Move map data into backtrace data proper.
| * Merge "Move map data into backtrace data proper."Christopher Ferris2015-02-0611-43/+65
| |\
| | * Move map data into backtrace data proper.Christopher Ferris2015-02-0611-43/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 5e753100: Merge "Clean up reading and writing in init."Elliott Hughes2015-02-0614-173/+259
|\ \ \ | |/ / | | | | | | | | | * commit '5e753100c32c7b42ae4306a8023c419defd34c4e': Clean up reading and writing in init.
| * | Merge "Clean up reading and writing in init."Elliott Hughes2015-02-0614-173/+259
| |\ \
| | * | Clean up reading and writing in init.Elliott Hughes2015-02-0614-173/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 17b5b352: Merge "fs_mgr: error check umount calls / add retry logic"Nick Kralevich2015-02-062-3/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '17b5b3520094de679c9e43a872c02d15758c83b8': fs_mgr: error check umount calls / add retry logic
| * | | Merge "fs_mgr: error check umount calls / add retry logic"Nick Kralevich2015-02-062-3/+14
| |\ \ \ | | |_|/ | |/| |
| | * | fs_mgr: error check umount calls / add retry logicNick Kralevich2015-02-052-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 62894122: Merge "Remove link to gccdemangle."Christopher Ferris2015-02-061-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6289412222bfe26ebeef2ea9c422e828c11ffc30': Remove link to gccdemangle.
| * | | Merge "Remove link to gccdemangle."Christopher Ferris2015-02-061-1/+0
| |\ \ \ | | |/ / | |/| |
| | * | Remove link to gccdemangle.Christopher Ferris2015-02-051-1/+0
| | |/ | | | | | | | | | | | | Bug: 18930951 Change-Id: Ib7fd332b6e02241c0676ef33d2fa210a72efe1b1
* | | am f52338fe: Merge "rootdir: enable armv8_deprecated swp hook"Greg Hackmann2015-02-051-0/+3
|\ \ \ | |/ / | | | | | | | | | * commit 'f52338fe1e8f74123a895db591d6a2a53061a2b1': rootdir: enable armv8_deprecated swp hook
| * | Merge "rootdir: enable armv8_deprecated swp hook"Greg Hackmann2015-02-051-0/+3
| |\ \ | | |/ | |/|
| | * rootdir: enable armv8_deprecated swp hookGreg Hackmann2015-02-051-0/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | 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>
* | am d558530b: Merge "Fix Windows build."Elliott Hughes2015-02-051-0/+3
|\ \ | |/ | | | | | | * commit 'd558530ba90cb6218fe8e255c71a034c3fe1ea58': Fix Windows build.
| * Merge "Fix Windows build."Elliott Hughes2015-02-051-0/+3
| |\
| | * Fix Windows build.Elliott Hughes2015-02-051-0/+3
| |/ | | | | | | | | | | | | Take 2. Probably should have done this in the beginning, but thought I was being clever. Change-Id: I85c6e487eece9bcc75f8f62c850c2d4d1ee9e908
* | am 6c3ff4fe: Merge "Fix Windows build."Elliott Hughes2015-02-051-0/+2
|\ \ | |/ | | | | | | * commit '6c3ff4fe7f0b1cd729bf61974dde845b611b99c0': Fix Windows build.
| * Merge "Fix Windows build."Elliott Hughes2015-02-051-0/+2
| |\
| | * Fix Windows build.Elliott Hughes2015-02-041-0/+2
| |/ | | | | | | | | | | | | Only two days in, and I'm already really regretting putting this code somewhere that builds for Mac OS and Windows... Change-Id: I576ee4a9e647e10dc2d47c7e1e38aedee2bf404c
* | am 051f369a: Merge "Build BSD grep separately from toolbox."Elliott Hughes2015-02-052-24/+23
|\ \ | |/ | | | | | | * commit '051f369a14a405dc6dbaf708dc51a21c5629bf88': Build BSD grep separately from toolbox.
| * Merge "Build BSD grep separately from toolbox."Elliott Hughes2015-02-052-24/+23
| |\
| | * Build BSD grep separately from toolbox.Elliott Hughes2015-02-042-24/+23
| |/ | | | | | | | | | | | | | | 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
* | am 1dee489c: Merge "Stop using #if for conditional compilation."Elliott Hughes2015-02-0511-185/+162
|\ \ | |/ | | | | | | * commit '1dee489ceaa9dfb6b6609f97380f20b0753eb2c1': Stop using #if for conditional compilation.
| * Merge "Stop using #if for conditional compilation."Elliott Hughes2015-02-0511-185/+162
| |\
| | * Stop using #if for conditional compilation.Elliott Hughes2015-02-0411-185/+162
| |/ | | | | | | | | | | | | | | Use regular 'if' to prevent bitrot. Also remove remaining typedefs. Change-Id: I2e6ca928e2db29b88b643cf990ff05cfb0be94a6
* | am 27d28d3b: Merge "Add a WriteStringToFile overload that cares about ↵Elliott Hughes2015-02-052-8/+38
|\ \ | |/ | | | | | | | | | | permissions." * commit '27d28d3baff860d1fd936a5fcf2d920577c52575': Add a WriteStringToFile overload that cares about permissions.
| * Merge "Add a WriteStringToFile overload that cares about permissions."Elliott Hughes2015-02-042-8/+38
| |\
| | * Add a WriteStringToFile overload that cares about permissions.Elliott Hughes2015-02-042-8/+38
| |/ | | | | | | Change-Id: I857a80b61768d4e9610bdd149eff2d9d8e48d2c0
* | am aec43a12: Merge "Use TEMP_FAILURE_RETRY, always build bootchart.cpp."Elliott Hughes2015-02-046-70/+25
|\ \ | |/ | | | | | | * commit 'aec43a12a76160e924fc0af9b131bd385cf7a60c': Use TEMP_FAILURE_RETRY, always build bootchart.cpp.
| * Merge "Use TEMP_FAILURE_RETRY, always build bootchart.cpp."Elliott Hughes2015-02-046-70/+25
| |\
| | * Use TEMP_FAILURE_RETRY, always build bootchart.cpp.Elliott Hughes2015-02-046-70/+25
| |/ | | | | | | | | | | | | | | 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
* | am 798219e9: Merge "Fix clang "ueventd.cpp:111:1: error: no return statement ↵Elliott Hughes2015-02-041-0/+2
|\ \ | |/ | | | | | | | | | | in function returning non-void"." * commit '798219e9e9137db272585f5dc5683df91ed5beb1': Fix clang "ueventd.cpp:111:1: error: no return statement in function returning non-void".
| * Merge "Fix clang "ueventd.cpp:111:1: error: no return statement in function ↵Elliott Hughes2015-02-041-0/+2
| |\ | | | | | | | | | returning non-void"."
| | * Fix clang "ueventd.cpp:111:1: error: no return statement in function ↵Elliott Hughes2015-02-041-0/+2
| |/ | | | | | | | | | | returning non-void". Change-Id: I69c9e5534975bffa0fbf98ca4af50400f6b94aa0
* | am e939e704: Merge "Build init as C++."Elliott Hughes2015-02-0420-146/+101
|\ \ | |/ | | | | | | * commit 'e939e70401c256df18ee614d69c2fbed41e0ad43': Build init as C++.
| * Merge "Build init as C++."Elliott Hughes2015-02-0420-146/+101
| |\
| | * Build init as C++.Elliott Hughes2015-02-0420-146/+101
| | | | | | | | | | | | | | | | | | This is just the minimal change to keep it building. Change-Id: I245c5b8413a1db114576c81462eb5737f5ffcef2
* | | am 04b30a06: Merge "logd: logd placed into background cgroup"Mark Salyzyn2015-02-041-0/+5
|\ \ \ | |/ / | | | | | | | | | * commit '04b30a06380dd64fac6812ed438d25da0c99a849': logd: logd placed into background cgroup
| * | Merge "logd: logd placed into background cgroup"Mark Salyzyn2015-02-041-0/+5
| |\ \ | | |/ | |/|
| | * logd: logd placed into background cgroupMark Salyzyn2015-02-041-0/+5
| |/ | | | | | | Change-Id: I38d7be05ab77fc944a9dbef2b6575d4caa920d08
* | am 5204b158: Merge "Fix x86_64 build"Dmitriy Ivanov2015-02-041-2/+2
|\ \ | |/ | | | | | | * commit '5204b1580e0d0f38272c7da166eee9b88c14dc50': Fix x86_64 build
| * Merge "Fix x86_64 build"Dmitriy Ivanov2015-02-041-2/+2
| |\
| | * Fix x86_64 buildDmitriy Ivanov2015-02-031-2/+2
| | | | | | | | | | | | Change-Id: Iaa3a641907de55b398a3bdd0bbc63cbb9d367982
* | | am 55732f49: Merge "android_reboot should take a const char*."Elliott Hughes2015-02-042-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '55732f49287a75f9baabe9f150443aec9234c90d': android_reboot should take a const char*.
| * | Merge "android_reboot should take a const char*."Elliott Hughes2015-02-042-2/+2
| |\ \ | | |/ | |/|
| | * android_reboot should take a const char*.Elliott Hughes2015-02-032-2/+2
| |/ | | | | | | | | | | The kernel argument is actually a void*, but it's only read from. Change-Id: I305c50249bf12b7fbdea4721257aed52a0372f8d
* | am e44d25d6: Merge "Add Google-style StringPrintf."Elliott Hughes2015-02-035-0/+175
|\ \ | |/ | | | | | | * commit 'e44d25d64537f4ea2abcb56aabc7a5bf0731c222': Add Google-style StringPrintf.
| * Merge "Add Google-style StringPrintf."Elliott Hughes2015-02-035-0/+175
| |\
generated by cgit v1.1 at 2024-12-24 19:31:35 +0000