summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix more buffer overruns."Elliott Hughes2015-04-176-223/+232
|\
| * Fix more buffer overruns.Elliott Hughes2015-04-176-223/+232
| | | | | | | | | | | | | | Also add some tests. Bug: 20323050 Change-Id: I9eaf3dc04efd85206663c4cca4f8c1208620a89a
* | Merge "Use PRI* macros to fix the Windows build."Elliott Hughes2015-04-171-4/+6
|\ \ | |/ |/|
| * Use PRI* macros to fix the Windows build.Elliott Hughes2015-04-171-4/+6
|/ | | | Change-Id: Icd400be05c2bc726265832875b5a05dba7966847
* Merge "Remove various fixed-length buffers (and their overflows)."Elliott Hughes2015-04-172-110/+59
|\
| * Remove various fixed-length buffers (and their overflows).Elliott Hughes2015-04-172-110/+59
|/ | | | | | | | | | Bug: 20323052 Bug: 20323051 Bug: 20317728 Bug: 20317727 Bug: 20317726 Bug: 20317725 Change-Id: I57a5e30a5b7867715f55cee7429aa36d7ce21484
* Merge "Remove extern "C" barriers to using C++."Elliott Hughes2015-04-1715-124/+21
|\
| * Remove extern "C" barriers to using C++.Elliott Hughes2015-04-1715-124/+21
| | | | | | | | Change-Id: Ic046d6aa540738cb46b54531bc59ba3b47b0136d
* | Merge "Show $ADB_VENDOR_KEYS if authentication fails."Elliott Hughes2015-04-175-50/+40
|\ \ | |/ |/|
| * Show $ADB_VENDOR_KEYS if authentication fails.Elliott Hughes2015-04-165-50/+40
|/ | | | | | | | | Incorrectly set $ADB_VENDOR_KEYS is the most likely cause of failed adb connections. Make it easier to debug such problems by including the value in use in the error message. Bug: 20165551 Change-Id: I64c1d98ae6d3fb40eea9e1f0ddcfcf4f2d9d7318
* Merge "Move usb_osx to C++."Dan Albert2015-04-172-10/+11
|\
| * Move usb_osx to C++.Dan Albert2015-04-162-10/+11
| | | | | | | | Change-Id: I21673211a702cc4f31d4311c36e2a4b22e55fac8
* | Merge "Link libraries needed for Darwin adb tests."Dan Albert2015-04-171-0/+4
|\ \ | |/
| * Link libraries needed for Darwin adb tests.Dan Albert2015-04-161-0/+4
| | | | | | | | Change-Id: I1c3c3a7bbd3824f5f3a37ee80c24d1c2a9b98748
* | Merge "Move sysdeps_win32 to C++."Elliott Hughes2015-04-173-98/+74
|\ \ | |/ |/|
| * Move sysdeps_win32 to C++.Elliott Hughes2015-04-163-98/+74
| | | | | | | | Change-Id: I27ca41b64d62bb3611b3a39a5c3bb4377d0773bc
* | Merge "[MIPS] Fast android_memset for Mips64, Mipsr6"Elliott Hughes2015-04-173-325/+96
|\ \ | |/ |/|
| * [MIPS] Fast android_memset for Mips64, Mipsr6Duane Sand2015-04-163-325/+96
| | | | | | | | | | | | | | | | | | | | Fix broken mips64 build by replacing mips32r2-only android_memset.S. Use HW-bonded pairs of 64-bit stores to fill 128 bits/cycle. Rely on HW automatic cache prefetch optimizations. Software cache prefetching is counterproductive on next mips cores. New method is coded in C, and also works okay on non-Mips architectures. Change-Id: Id7153a8fe11538fe25287e101375661b0e99e2a2
* | Merge "Switch usb_linux_client to C++."Elliott Hughes2015-04-162-31/+17
|\ \
| * | Switch usb_linux_client to C++.Elliott Hughes2015-04-162-31/+17
| | | | | | | | | | | | Change-Id: I8172e81e6c4665aa16e9e8e0c33b048dbb9ad848
* | | Merge "Revert "cutils: add OS-independent endian.h""Greg Hackmann2015-04-163-113/+0
|\ \ \ | |/ / |/| |
| * | Revert "cutils: add OS-independent endian.h"Greg Hackmann2015-04-163-113/+0
| | | | | | | | | | | | This reverts commit c3bac8b6719332f31140b2a034b70cf7f9eb3e51.
* | | Merge "Move get_my_path_darwin to C++."Elliott Hughes2015-04-162-1/+1
|\ \ \
| * | | Move get_my_path_darwin to C++.Elliott Hughes2015-04-162-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As long as we have C in here, we can't use C++ in our headers. Change-Id: Ibccaa77a5af506dc504aa9c39c8dca5dcdbeccab
* | | | Merge "cutils: add OS-independent endian.h"Greg Hackmann2015-04-163-0/+113
|\ \ \ \ | | |/ / | |/| |
| * | | cutils: add OS-independent endian.hGreg Hackmann2015-04-163-0/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cutils/endian.h provides the helpers defined in endian(3), either by pulling in the OS's built-in endian.h (where available) or recreating them using GCC builtins. Change-Id: Ic8965f67e1efdc03f884dbe6b7fe0276f840e4fc Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | Merge "Don't try to read /system/default.prop."Elliott Hughes2015-04-161-1/+0
|\ \ \ \
| * | | | Don't try to read /system/default.prop.Elliott Hughes2015-04-151-1/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | It doesn't exist. We use /system/build.prop. Change-Id: Ie635f9b3cc65de807f128339199b853db5a8eb2f
* | | | Merge "Move trace.h to stdatomic."Yabin Cui2015-04-163-11/+11
|\ \ \ \
| * | | | Move trace.h to stdatomic.Yabin Cui2015-04-163-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20262261 Change-Id: Idaf984786804eb76c285f38b11abbbc0d3706509
* | | | | Merge "logd: propagate ::log status"Mark Salyzyn2015-04-165-24/+35
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | logd: propagate ::log statusMark Salyzyn2015-04-155-24/+35
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a return value for the ::log() methods, this allows us to optimize the wakeup for the readers to only occur when the log message is actually placed. This is for a future where we may dedupe identical log messages, filter out log messages, and certainly if we filter the messages out with an internal logd check of __android_log_is_loggable(). Change-Id: I763b2a7c29502ab7fa0a5d5022c7b60244fcfde4
* | | | Merge "libcutils: fs_config must use O_BINARY"Mark Salyzyn2015-04-161-2/+6
|\ \ \ \
| * | | | libcutils: fs_config must use O_BINARYMark Salyzyn2015-04-161-2/+6
|/ / / / | | | | | | | | | | | | | | | | Bug: 19908228 Change-Id: I3273cf99b320941f9530a015c9e582af72469acb
* | | | Merge "libcutils: fs_config: winsdk_tools build fix"Mark Salyzyn2015-04-161-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | libcutils: fs_config: winsdk_tools build fixMark Salyzyn2015-04-161-1/+1
|/ / / | | | | | | | | | | | | Bug: 19908228 Change-Id: Ia725d20ca4f8a87deec63b6c661f6a09c8671231
* | | Merge "libcutils: drop use of mmap"Mark Salyzyn2015-04-161-45/+30
|\ \ \
| * | | libcutils: drop use of mmapMark Salyzyn2015-04-151-45/+30
|/ / / | | | | | | | | | | | | | | | | | | - Causes a build break for MAC and Windows Bug: 19908228 Change-Id: I9d69967aa988c9ca202805593fa846cb670101cf
* | | Merge "libsparse: move_chunks_up_to_len() does not account skip chunks"Colin Cross2015-04-161-3/+10
|\ \ \
| * | | libsparse: move_chunks_up_to_len() does not account skip chunksJeremy Compostella2015-04-081-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I caught the fastboot host command sending more data than the fastboot device can accept. Fastboot host command was sending 36 surplus bytes because of 3 skip chunks that were not taken into account in move_chunks_up_to_len() algorithm. Change-Id: I39a4a033c9b15893bd70e553f17116735ee4a48e
* | | | Merge "libcutils: add fs_config_generate"Mark Salyzyn2015-04-152-0/+23
|\ \ \ \
| * | | | libcutils: add fs_config_generateMark Salyzyn2015-04-152-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19908228 Change-Id: Icb0e189a86758bb779b9bdf7c0d92216d297869f
* | | | | Merge "libcutils: fs_config read from file"Mark Salyzyn2015-04-151-12/+141
|\ \ \ \ \ | |/ / / /
| * | | | libcutils: fs_config read from fileMark Salyzyn2015-04-151-12/+141
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intention is to read from ${OUT}/system/etc/fs_config_dirs and ${OUT}/system/etc/fs_config_files on host. And /system/etc/fs_config_dirs and /system/etc/config_files on target systems. Bug: 19908228 Change-Id: Ieaedd99e88c7f7f717878d9344c387ddf335ccbb
* | | | Merge "Remove libunwind-ptrace dependency."Christopher Ferris2015-04-151-1/+0
|\ \ \ \
| * | | | Remove libunwind-ptrace dependency.Christopher Ferris2015-04-151-1/+0
| | |/ / | |/| | | | | | | | | | Change-Id: Iae4a73546f672c208ffe1b224e8d9a9e693f95f0
* | | | Merge "Revert "libcutils: fs_config read from file""Mark Salyzyn2015-04-151-125/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "libcutils: fs_config read from file"Mark Salyzyn2015-04-151-125/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no endian.h on windows This reverts commit 4e5f71ae727c5993db05d0024da026bf68eabc59. Change-Id: I6aedf35ed319c7f8febc7ab98e104a625fb27f69
* | | | Merge "libcutils: fs_config read from file"Mark Salyzyn2015-04-151-12/+125
|\ \ \ \ | |/ / /
| * | | libcutils: fs_config read from fileMark Salyzyn2015-04-151-12/+125
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Intention is to read from ${OUT}/system/etc/fs_config_dirs and ${OUT}/system/etc/fs_config_files on host. And /system/etc/fs_config_dirs and /system/etc/config_files on target systems. Bug: 19908228 Change-Id: I0966a94f79a3fae4f7325056c701ea355370f9df