summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix "adb sync" for devices without vendor and oem."Elliott Hughes2015-04-213-28/+24
|\
| * Fix "adb sync" for devices without vendor and oem.Elliott Hughes2015-04-213-28/+24
|/ | | | | Bug: http://b/20440110 Change-Id: I2481992198890f5ca50412c2b7ca361101961413
* Merge "Always explain why bind(2) failed."Elliott Hughes2015-04-215-23/+27
|\
| * Always explain why bind(2) failed.Elliott Hughes2015-04-205-23/+27
| | | | | | | | | | | | | | This has confused several people lately. Bug: http://b/20219978 Change-Id: I2537ceb83bff0b3166c230c728d4389a983db858
* | Merge "Use ' quoting to escape arguments."Elliott Hughes2015-04-212-32/+31
|\ \
| * | Use ' quoting to escape arguments.Elliott Hughes2015-04-172-32/+31
| |/ | | | | | | | | | | | | | | | | | | | | The specific motivating case is "text;ls;1.apk", but rather than continue adding individual characters to the list of characters to be escaped, let's just switch to quote all arguments with ', which only leaves ' itself to be escaped. Bug: 20323053 Bug: 19734868 Change-Id: I8bd71db9373bc2d1169fc11e46c889da6638550a
* | Merge "Remove a declaration for an unimplemented function."Elliott Hughes2015-04-211-1/+0
|\ \
| * | Remove a declaration for an unimplemented function.Elliott Hughes2015-04-201-1/+0
| |/ | | | | | | Change-Id: I890cef52e9a8c26d98f227f269a7dcfcb6eaa795
* | Merge "logd: better drop message merging"Mark Salyzyn2015-04-201-18/+70
|\ \
| * | logd: better drop message mergingMark Salyzyn2015-04-201-18/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Former algorithm anlo coalesced adjacent records - New algorithm maintains a hash list of all drop records and coalesces them all. Bug: 20334069 Bug: 20370119 Change-Id: Idc15ce31fc1087c2cfa39da60c62feade8b88761
* | | Merge "Fix windows adb build"Colin Cross2015-04-202-2/+8
|\ \ \ | |/ / |/| |
| * | Fix windows adb buildColin Cross2015-04-202-2/+8
|/ / | | | | | | | | | | | | libc++ is not available on windows yet, but it already defaults to static libstdc++. Change-Id: I85a766ead84f71fe1f2f59be6ac739b0b833b6db
* | Merge "statically link adb and fastboot against libc++"Colin Cross2015-04-202-0/+14
|\ \
| * | statically link adb and fastboot against libc++Colin Cross2015-04-162-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libc++.so is not widely available on the host, so we compile against one built as part of the platform. This causes problems for adb and fastboot, which are distributed through a number of channels - the sdk, distro packages, downloaded from the build server, or manually copied. Instead of forcing all users to handle libc++.so too, statically link against libc++. Change-Id: I51b75258653a23558c8b598802005f6c1166a439
* | | Merge "create /data/misc/gatekeeper"Nick Kralevich2015-04-201-0/+1
|\ \ \
| * | | create /data/misc/gatekeeperNick Kralevich2015-04-201-0/+1
|/ / / | | | | | | | | | Change-Id: I7631401ac21b60a22f6fd4052814186bf3bc2b05
* | | Merge "Reserve space on disk using fallocate"Narayan Kamath2015-04-201-1/+16
|\ \ \
| * | | Reserve space on disk using fallocateƁukasz Szymczyk2015-04-201-1/+16
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were crashes when android failed to extract zip archives due to out of free space on disk, with stacks like: #00 pc 00000000000156b0 /system/lib64/libc.so (memcpy+176) #01 pc 000000000002e5b8 /system/lib64/libandroidfw.so #02 pc 000000000002f488 /system/lib64/libandroidfw.so (ExtractToMemory+328) #03 pc 000000000002f5c8 /system/lib64/libandroidfw.so (ExtractEntryToFile+268) #04 pc 00000000000287d8 /system/lib64/libandroidfw.so (android::ZipFileRO::\ uncompressEntry(void*, int) const+12) Space for the file is now allocated using fallocate rather than ftruncate, since ftruncate dont actually reserve space on disk. When writes to the mmaped pointer fails to be realized due to out of space SIGBUS is the result. With this change we make sure that there is space available before mmaping the pointer. Change-Id: Ic5e8c33dbe729edb57919dacff73811b34cc2dc2
* | | Merge "Fix the Windows adb build."Elliott Hughes2015-04-193-20/+29
|\ \ \ | |_|/ |/| |
| * | Fix the Windows adb build.Elliott Hughes2015-04-193-20/+29
|/ / | | | | | | | | | | | | | | | | | | It looks like we can't use clang on Windows yet because libc++ isn't ready. So move back to GCC for the Windows host clang. Work around the mingw printf format string problems that made us want to switch to clang in the first place, and #include "sysdeps.h" in adb_utils.cpp to work around the absence of lstat(2) on Windows. Change-Id: Icd0797a8c0c2d1d326bdd704ba6bcafcbaeb742f
* | Merge "Use escape_arg in "adb backup"."Elliott Hughes2015-04-182-39/+22
|\ \
| * | Use escape_arg in "adb backup".Elliott Hughes2015-04-172-39/+22
|/ / | | | | | | | | | | | | | | This doesn't fix the injection vulnerability, but it makes "adb backup" no worse than the other commands, and lets me fix them all at once. Bug: 20323053 Change-Id: I39843c065d9d738b6b7943b2ffd660e4a031cc36
* | Merge "Remove yet more fixed-length buffers (and their overruns)."Elliott Hughes2015-04-186-90/+27
|\ \
| * | Remove yet more fixed-length buffers (and their overruns).Elliott Hughes2015-04-176-90/+27
| | | | | | | | | | | | | | | Bug: 20317724 Change-Id: If137fc96f5f23576ccecd388ac87afefa47337c6
* | | Merge "Fix comment typo."Elliott Hughes2015-04-181-1/+1
|\ \ \ | |/ / |/| |
| * | Fix comment typo.Elliott Hughes2015-04-171-1/+1
|/ / | | | | | | Change-Id: I2d7082c44123e90d74b2669ab29d787b9aa64863
* | Merge "Switch adb over to clang."Elliott Hughes2015-04-171-1/+1
|\ \
| * | Switch adb over to clang.Elliott Hughes2015-04-171-1/+1
|/ / | | | | | | Change-Id: Ib5511dcba56e80ffce6bc293d99251ccfd61c330
* | 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.