summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* system/core 64-bit cleanup.Elliott Hughes2014-01-1630-64/+57
| | | | | | | | | This cleans up most of the size-related problems in system/core. There are still a few changes needed for a clean 64-bit build, but they look like they might require changes to things like the fastboot protocol. Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
* Merge "restorecon /data/misc/media."Nick Kralevich2014-01-151-0/+1
|\
| * restorecon /data/misc/media.Stephen Smalley2014-01-151-0/+1
|/ | | | | | | Otherwise it will be mislabeled on upgrades with existing userdata. Change-Id: Ibde88d5d692ead45b480bb34cfe0831baeffbf94 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* Merge "Revert "fs_mgr: correct warning on unused function parameter""Nick Kralevich2014-01-151-1/+1
|\
| * Revert "fs_mgr: correct warning on unused function parameter"Nick Kralevich2014-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build is broken. system/core/fs_mgr/fs_mgr.c:824:77: error: expected '(' before 'unused' const char *blk_device, long long length __attribute__(unused)) ^ system/core/fs_mgr/fs_mgr.c: In function 'fs_mgr_add_entry': system/core/fs_mgr/fs_mgr.c:824:56: warning: unused parameter 'length' [-Wunused-parameter] const char *blk_device, long long length __attribute__(unused)) ^ make: *** [out/target/product/generic_x86/obj/STATIC_LIBRARIES/libfs_mgr_intermediates/fs_mgr.o] Error 1 make: *** Waiting for unfinished jobs.... This reverts commit 21095d0cae64c70b4ac7e90af7a6787019cc317a. Change-Id: I64f8c4d9c17c0e3bbf2eb427a2c0b81bbe66ec3a
* | Merge "fs_mgr: correct warning on unused function parameter"Nick Kralevich2014-01-151-1/+1
|\ \ | |/
| * fs_mgr: correct warning on unused function parameterWilliam Roberts2014-01-141-1/+1
| | | | | | | | | | | | | | | | | | 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
* | Merge "Copy the bionic -fstack-protector hack into libbacktrace."Elliott Hughes2014-01-151-0/+5
|\ \
| * | Copy the bionic -fstack-protector hack into libbacktrace.Elliott Hughes2014-01-141-0/+5
|/ / | | | | | | | | | | aarch64 doesn't support -fstack-protector yet. Change-Id: Id1e589742ba074f59d3390d059248c9b371aff58
* | Merge "Fix fastbootd build for 64-bit."Elliott Hughes2014-01-153-14/+16
|\ \
| * | Fix fastbootd build for 64-bit.Elliott Hughes2014-01-143-14/+16
|/ / | | | | | | Change-Id: I04bef46f0125fd6a8fc0cb966bd257ad594aff1e
* | Merge "Don't set LD_LIBRARY_PATH globally."Elliott Hughes2014-01-141-1/+0
|\ \
| * | Don't set LD_LIBRARY_PATH globally.Elliott Hughes2014-01-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "AArch64: Add atomic functions"Elliott Hughes2014-01-143-1/+247
|\ \ \ | |_|/ |/| |
| * | AArch64: Add atomic functionsAshok Bhat2014-01-143-1/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge "Create a bare bones host libbacktrace on mac."Christopher Ferris2014-01-143-16/+34
|\ \ \
| * | | Create a bare bones host libbacktrace on mac.Christopher Ferris2014-01-133-16/+34
|/ / / | | | | | | | | | | | | | | | | | | This allows the libbacktrace library to compile for host on mac. Bug: 12474939 Change-Id: I32cbcf996e6fe9057e5065ba21f89086343704a0
* | | Merge "Next phase of the move, reformat use C++ features."Christopher Ferris2014-01-1417-1925/+1812
|\ \ \
| * | | Next phase of the move, reformat use C++ features.Christopher Ferris2014-01-1317-1925/+1812
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "restorecon_recursive("/sys") speed boot time"Nick Kralevich2014-01-141-11/+34
|\ \ \ | |/ / |/| |
| * | restorecon_recursive("/sys") speed boot timeNick Kralevich2014-01-101-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Emerson USB ID"Colin Cross2014-01-121-0/+3
|\ \ \ | |/ / |/| |
| * | Emerson USB IDJon Sawyer2014-01-111-0/+3
| | | | | | | | | | | | | | | | | | | | | Adds Emerson's USB id to the known USB Devices. Change-Id: If6115c2551c1f30a5c190690f2aeaaf2adff7ee1 Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
* | | Merge "Move to C++ for debuggerd."Christopher Ferris2014-01-119-14/+22
|\ \ \ | |_|/ |/| |
| * | Move to C++ for debuggerd.Christopher Ferris2014-01-109-14/+22
|/ / | | | | | | | | | | | | | | | | 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
* | Merge "Init the abort_msg_address value."Christopher Ferris2014-01-101-0/+2
|\ \
| * | Init the abort_msg_address value.Christopher Ferris2014-01-101-0/+2
| | | | | | | | | | | | | | | | | | | | | When initiating a manual dump, the abort_msg_address parameter is random garbage. Initialize this value to 0. Change-Id: I9ba817ee6104f47cfcb2b746bfa6f02a259c86d7
* | | Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>."Elliott Hughes2014-01-103-3/+3
|\ \ \ | |/ / |/| |
| * | Use the more portable <elf.h> instead of <sys/exec_elf.h>.Elliott Hughes2014-01-103-3/+3
|/ / | | | | | | | | Bug: 12476126 Change-Id: I08684987e867371d5537dadf1acb3408b420ad0c
* | Merge "toolbox: Fix date tool with /dev/alarm"Benoit Goby2014-01-101-1/+1
|\ \
| * | toolbox: Fix date tool with /dev/alarmBenoit Goby2014-01-091-1/+1
|/ / | | | | | | | | Change-Id: I6f8ad2149244c89690d5d5caae8ec55429462210 Signed-off-by: Benoit Goby <benoit@android.com>
* | Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."Christopher Ferris2014-01-094-17/+24
|\ \
| * | Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.Christopher Ferris2014-01-094-17/+24
|/ / | | | | | | | | | | | | | | | | | | | | Use a bit better name for this. The other name was a bit confusing. Change-Id: I1261f2ee3854a9c8b82133ad0bfbbbe48b43c9ac (cherry picked from commit 242b1a8c7a5ec73172bac811e51acbc27201f22c) Conflicts: libbacktrace/Backtrace.cpp
* | Merge "Move CallStack to libbacktrace."Christopher Ferris2014-01-096-123/+36
|\ \
| * | Move CallStack to libbacktrace.Christopher Ferris2014-01-096-123/+36
|/ / | | | | | | | | | | | | | | | | Fix a small bug in the Printer for strings that didn't properly prepend the prefix. (cherry picked from commit 9b0e074c6d38143e01616404a08b0c7aa992f3c3) Change-Id: I78bfa3f76864c34f33fb439bf20dfc85616f1077
* | Merge "HP USB ID"Colin Cross2014-01-091-0/+3
|\ \
| * | HP USB IDJon Sawyer2014-01-081-0/+3
| |/ | | | | | | | | | | | | Adds HP's USB id to the know USB Devices Change-Id: I975126f3ae5e53f25e18dea7cc43c29076bfc965 Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
* | Merge "Fix tracing on user builds"Colin Cross2014-01-091-0/+2
|\ \
| * | Fix tracing on user buildsCarton He2013-12-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Need the set correct permission for print-tgid option or tracing of sched can't work on user build. Change-Id: Ia88aabe58128b911afd78f01c27f7da884ed03f0 Signed-off-by: Carton He <carton.he@marvell.com>
* | | Merge "Refactor to share map_info amongst threads."Christopher Ferris2014-01-0810-44/+75
|\ \ \
| * | | Refactor to share map_info amongst threads.Christopher Ferris2014-01-0810-44/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the use of the same map info to be shared when getting information on multiple threads from the same pid. Change-Id: I2e460e20154a10f4894ae563331fb32179e4551f
* | | | Merge "Label existing /data/mediadrm files."Nick Kralevich2014-01-081-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Label existing /data/mediadrm files.rpcraig2014-01-071-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Use restorecon_recursive to label devices where the directory and subfiles have already been built and labeled. Change-Id: I0dfe1e542fb153ad20adf7b2b1f1c087b4956a12 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."Elliott Hughes2014-01-082-11/+0
|\ \ \ | |/ / |/| |
| * | SWAP_FLAG_* constants are now in <sys/swap.h>.Elliott Hughes2014-01-072-11/+0
| | | | | | | | | | | | | | | Bug: 9336527 Change-Id: I77e2b05cefbfb4eebda39b4079107833f4160563
* | | Merge "Fix the ucontext for mips/x86."Christopher Ferris2014-01-071-15/+4
|\ \ \ | |/ / |/| |
| * | Fix the ucontext for mips/x86.Christopher Ferris2014-01-071-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the mips ucontext definition, there is no need for it any more. Fix the mips/x86 ucontext copy code to copy the entire uc_mcontext data across. Fix a potential memory leak too. Change-Id: I4272022da5281ed881e2d59a3e19e7f33c01aceb
* | | Merge "Dwarf backtrace for MIPS"Elliott Hughes2014-01-074-84/+1061
|\ \ \ | |/ / |/| |
| * | Dwarf backtrace for MIPSChris Dearman2013-12-114-84/+1061
| | | | | | | | | | | | | | | | | | | | | The Dwarf parsing code was copied from backtrace-x86.c and modified for MIPS Change-Id: I62c698fbbea28be39320a921dd778269dc478528
* | | Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...Colin Cross2014-01-061-150/+175
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: adb: Add USB vendor ID for YotaDevices adb: Add USB vendor ID for TechFaith adb: Add USB vendor ID for Rockchip adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd. adb: Add USB vendor ID for Allwinner adb: Add USB vendor ID for Amlogic added Gigaset's USB vendor ID adb: alphabetically sort usb vendors lists
generated by cgit v1.1 at 2025-01-10 22:28:50 +0000