summaryrefslogtreecommitdiffstats
path: root/adb
Commit message (Collapse)AuthorAgeFilesLines
* am 0750f786: Merge "Remove explict use of ASCII encoding"Elliott Hughes2014-11-211-1/+1
|\ | | | | | | | | * commit '0750f78659758352490e599d057a39dc44e93340': Remove explict use of ASCII encoding
| * Merge "Remove explict use of ASCII encoding"Elliott Hughes2014-11-211-1/+1
| |\
| | * Remove explict use of ASCII encodingAl Sutton2014-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the use of CFStringGetCString with kCFStringEncodingASCII specified with CFStringGetFileSystemRepresentation which will ensure the correct character encoding is used to conver the CFString into a NULL terminated char array suitable for use with POSIX APIs. Change-Id: Ibab1dc05c4f4db8604d329a493b4241992b8e69d
* | | am 01d49e85: Merge "adb: Add USB vendor ID for Ubiquiti Networks, Inc."Elliott Hughes2014-11-211-0/+3
|\ \ \ | |/ / | | | | | | | | | * commit '01d49e854fa09a776c9673b229efcfa2d53adfea': adb: Add USB vendor ID for Ubiquiti Networks, Inc.
| * | Merge "adb: Add USB vendor ID for Ubiquiti Networks, Inc."Elliott Hughes2014-11-211-0/+3
| |\ \ | | |/ | |/|
| | * adb: Add USB vendor ID for Ubiquiti Networks, Inc.Jeremy Chang2014-11-191-0/+3
| | | | | | | | | | | | | | | Change-Id: Iedb86b9ff8dc55aea5d0df201a98c96418002207 Signed-off-by: Jeremy Chang <jeremy@ubnt.com>
* | | am aa3e17e1: Merge "Return path including executable instead of without"Elliott Hughes2014-11-201-5/+5
|\ \ \ | |/ / | | | | | | | | | * commit 'aa3e17e1b685218cddeb7a05e68ff1721a322147': Return path including executable instead of without
| * | Merge "Return path including executable instead of without"Elliott Hughes2014-11-201-5/+5
| |\ \
| | * | Return path including executable instead of withoutAl Sutton2014-11-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation returned the path the executable was in instead of returning the path including the executable (i.e. it returned ...bin instead of ...bin/executable). This is not what the original methods did and caused the process forking of adb to fail. This patch corrects the implementation. Change-Id: Ib58497cab35706041f170c1bc97c31fd5d965f90
* | | | am 51184950: Merge "Disable vendor id filtering for Linux."Elliott Hughes2014-11-202-20/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '511849507a7b2f4e259f6763c62f0c8619977b06': Disable vendor id filtering for Linux.
| * | | Disable vendor id filtering for Linux.Elliott Hughes2014-11-192-20/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | It's time we switched to blacklisting any problematic devices rather than slowly whitelisting the entire world. This seems to work for me, but let's see how other people get on before coming back to actually remove the list. We'll also need to find a Mac to test the equivalent Mac change. Change-Id: I2bf583a27f9a3f98ef006ea62b906a4f89960507
* | | am 20860a28: Merge "Fix building on modern versions of Xcode and OS X."Elliott Hughes2014-11-191-7/+7
|\ \ \ | |/ / | | | | | | | | | * commit '20860a28c5be013da111cb794c92dae02aa30089': Fix building on modern versions of Xcode and OS X.
| * | Fix building on modern versions of Xcode and OS X.Al Sutton2014-11-191-7/+7
| |/ | | | | | | | | | | | | | | | | | | | | Recent versions of XCode fail to compile the adb and fastboot binaries due to two functions being deprecated in 10.9 (GetCurrentProcess and ProcessInformationCopyDictionary), and the use of -Werrror. This patch replaces the method implementations which use calls to methods deprecated in the 10.9 SDK with versions which only call non-deprecated methods. Change-Id: I855bf26aff45093ca9022924f3ecd1b80f2305a8
* | am 0655d38b: Merge "Revert "adb: Add USB vendor ID for Honeywell""Elliott Hughes2014-11-181-3/+0
|\ \ | |/ | | | | | | * commit '0655d38b0c998f294ad52f1f8e84233a48046e97': Revert "adb: Add USB vendor ID for Honeywell"
| * Merge "Revert "adb: Add USB vendor ID for Honeywell""Elliott Hughes2014-11-181-3/+0
| |\
| | * Revert "adb: Add USB vendor ID for Honeywell"Elliott Hughes2014-11-181-3/+0
| | | | | | | | | | | | | | | | | | This reverts commit 8c4c8e8988411449ecb2f50c25d3e4188e81e7c0. Change-Id: Ia1cad862f42e5bea3174ed2cc0eea5232fc0a858
* | | am 6a56ad28: Merge "kill HAVE_TERMIO_H"Yabin Cui2014-11-181-12/+17
|\ \ \ | |/ / | | | | | | | | | * commit '6a56ad28c385ad799f25a1b90213b2367fcb9e22': kill HAVE_TERMIO_H
| * | kill HAVE_TERMIO_HYabin Cui2014-11-171-12/+17
| | | | | | | | | | | | | | | Bug: 18398307 Change-Id: Idbb89a074cdf16869cae3f667e89472781f37a5f
* | | Introduce "adb keygen"Nick Kralevich2014-11-173-3/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | automerge: 86c9e5f * commit '86c9e5f7e20a3f1712038ce642628c2e1e866434': Introduce "adb keygen"
| * | | Introduce "adb keygen"Nick Kralevich2014-11-143-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce the "adb keygen" command. Usage: adb keygen <filename> This command creates an adb public/private key pair in a user specified file. This can be used to create new adb keys, or rotate existing keys. Modify adb's key generation routines to use the HOSTNAME/LOGNAME environment variables if available. This allows someone to override the username/hostname embedded within the adb public key file if desired. Fallback to the old mechanisms if those environment variables aren't available. Bug: 18342715 Change-Id: Ibccee6088d4609aa05ad6687d3a1d8a8689d3e8a (cherry picked from commit af782b9f2ac4fb817ded80d4317a45345bb3f992) Change-Id: Ic76ffc9412171dddc879af0bbf6e20fbe1a8f057
| * | | Fix adb/fastboot windows compilations.Christopher Ferris2014-11-064-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many of the windows files where not including stdlib.h even though they are using malloc/free calls. Bug: 18283958 (cherry picked from commit ae7bf0959bd3f79afbf365e41f015ed1c304afdc) Change-Id: Iebc09cc314fa8f0ba6c6cd45ba26135052f156dd
* | | | am c9582d02: Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-133-20/+18
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'c9582d02391393d38b511f8c58be5429bdcb0406': kill HAVE_FORKEXEC
| * | | kill HAVE_FORKEXECYabin Cui2014-11-123-20/+18
| | | | | | | | | | | | | | | | | | | | Bug: 18317407 Change-Id: I4eecb3c9d745e3dabfc46fa595aac7f94f6d93e3
* | | | Fix adb/fastboot windows compilations.Christopher Ferris2014-11-064-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Many of the windows files where not including stdlib.h even though they are using malloc/free calls. Change-Id: If6959df9909d9d9928e9f4a2a96018166361cf3c
* | | | am 26552565: am 452f08a0: Merge "Add razer usb vid for future use with adb"Elliott Hughes2014-11-051-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '2655256570b7c1c5af6d886735835eecb99f45f2': Add razer usb vid for future use with adb
| * | | am 452f08a0: Merge "Add razer usb vid for future use with adb"Elliott Hughes2014-11-051-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '452f08a0b78e65cbd7e4cddac133e59f94d5db4c': Add razer usb vid for future use with adb
| | * | | Add razer usb vid for future use with adbStuart Wells2014-11-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b76c297de900da050473b764517cfd15c64b838 Signed-off-by: Stuart Wells <stuart.wells@razerzone.com>
| * | | | am 7e38ab47: am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH"JP Abgrall2014-10-201-0/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '7e38ab476f808f84f0755ccbceb4cd7d8a1982a3': adb: Add USB vendor ID for TrekStor GmbH
| * | | | am 2f431a8d: Fix windows-specific error without messing up Makefile flags.Stephen Hines2014-10-024-5/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f431a8d5a1c2029af470a7336751a555131ee51': Fix windows-specific error without messing up Makefile flags.
| * \ \ \ \ am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.Stephen Hines2014-10-021-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3ea87c33a1c6e940322f5436cf0dd70a0bdadd75': Fix build breakage for missing -Wcpp option on old GCC versions.
| * \ \ \ \ \ am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" ↵Stephen Hines2014-10-014-4/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '64f44b8444dabd69cf391d42e10d44e8e926a79d': Remove obsolete reference to ddk; Fixes for -Werror
| * \ \ \ \ \ \ am c75dac39: Merge "fix for adbd pinning CPU" into lmp-devVince Harron2014-09-301-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c75dac394e3fcd9760841a820d8a0c93dd0c276e': fix for adbd pinning CPU
| * \ \ \ \ \ \ \ am 9005ec37: am e3d3016d: Merge "Switch from using base64 BIOs to encoding ↵Alex Klyubin2014-09-261-19/+47
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | funcs." * commit '9005ec378ecd281f52945b5baca87245543bbfbf': Switch from using base64 BIOs to encoding funcs.
| * \ \ \ \ \ \ \ \ am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2).""Dan Albert2014-09-251-4/+21
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8e1e54154bc7a5e9dee206735474186c2276b111': Revert "Switch adb to epoll(2)."
| * \ \ \ \ \ \ \ \ \ am 790e7c0a: am 3772545c: Merge "Switch adb to epoll(2)."Elliott Hughes2014-09-231-21/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '790e7c0ac46bca5ad511ba8764bbb0e9646c6f2a': Switch adb to epoll(2).
* | \ \ \ \ \ \ \ \ \ \ Merge "adb warns on remount when verity is enabled" into lmp-mr1-devPaul Lawrence2014-10-281-1/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 3dbcc8b * commit '3dbcc8b9332cdbaa0dae47a6cae3a043f96262fe': adb warns on remount when verity is enabled
| * | | | | | | | | | | adb warns on remount when verity is enabledPaul Lawrence2014-10-271-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18119147 Change-Id: I75e5edf83fa01dbf2495e24df4597dce41f13654
* | | | | | | | | | | | am 7e38ab47: am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH"JP Abgrall2014-10-201-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e38ab476f808f84f0755ccbceb4cd7d8a1982a3': adb: Add USB vendor ID for TrekStor GmbH
| * | | | | | | | | | | adb: Add USB vendor ID for TrekStor GmbHThorsten Koroscha2014-10-201-0/+3
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d7fc14e691b4ab504c5205b21c93939499cdff9 Signed-off-by: Thorsten Koroscha <t.koroscha@trekstor.de>
* | | | | | | | | | | resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-105-4/+219
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | Change-Id: I6b62347c3acfda7c2c954e719547021009d20c01
| * | | | | | | | | | Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""Paul Lawrence2014-10-095-4/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 152d2d4234ba89e0c20c4af13e291b6049a7bc33. Fixed build error, and also fixed memory leak spotted from warning. Bug: 17691572 Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
* | | | | | | | | | | resolved conflicts for merge of a49bfc0d to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-095-219/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ff777a6309aab2b5b18323dd4ee7617cb1c3180
| * | | | | | | | | | Revert "Enable verity on userdebug, and add disable-verity to adb"Nick Kralevich2014-10-085-219/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build is broken. system/core/fs_mgr/fs_mgr_verity.c: In function 'fs_mgr_setup_verity': system/core/fs_mgr/fs_mgr_verity.c:103:20: error: 'verity_table_signature' may be used uninitialized in this function [-Werror=maybe-uninitialized] if (!RSA_verify(key, ^ system/core/fs_mgr/fs_mgr_verity.c:374:11: note: 'verity_table_signature' was declared here char *verity_table_signature; ^ cc1: all warnings being treated as errors make: *** [out/target/product/minnow/obj/STATIC_LIBRARIES/libfs_mgr_intermediates/fs_mgr_verity.o] Error 1 make: *** Waiting for unfinished jobs.... This reverts commit d4cea0bc16d1ad96cc6d6177232d7b339785460c. Change-Id: I6862cc79ef9d944a2472b6fb2e46dae514cea8ce
* | | | | | | | | | | resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-095-4/+220
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icdc9306b460c116441aad21bfcf3ab549224a141
| * | | | | | | | | | Enable verity on userdebug, and add disable-verity to adbPaul Lawrence2014-10-085-4/+219
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17691572 Change-Id: I58f588f318e7952d06a41325337d946d7c007e31
* | | | | | | | | | am a866e5a8: am 6cf1193b: am 2f431a8d: Fix windows-specific error without ↵Stephen Hines2014-10-024-5/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | messing up Makefile flags. * commit 'a866e5a8eb0d331c5970ee106cf8f5bd0903eb7c': Fix windows-specific error without messing up Makefile flags.
| * | | | | | | | | Fix windows-specific error without messing up Makefile flags.Stephen Hines2014-10-014-5/+3
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14416410 The proper fix for the error/warning we encountered is to move winsock2.h in front of windows.h. Change-Id: I29504ba3a184a85c6636d06c2ad900828fdb5436
* | | | | | | | | am 541a7804: am 490f03d5: am 3ea87c33: Fix build breakage for missing -Wcpp ↵Stephen Hines2014-10-021-1/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option on old GCC versions. * commit '541a780454ca5299a96a5d9bae1fcb650a0c0659': Fix build breakage for missing -Wcpp option on old GCC versions.
| * | | | | | | | Fix build breakage for missing -Wcpp option on old GCC versions.Stephen Hines2014-10-011-1/+4
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14416410 Change-Id: Ib30c3739d50d6122b3b4643051c72f2fa4985686
* | | | | | | | am 4acabfee: am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for ↵Stephen Hines2014-10-024-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Werror" into lmp-dev * commit '4acabfee9e00962be02d06a6771da2e7ade20859': Remove obsolete reference to ddk; Fixes for -Werror
generated by cgit v1.1 at 2025-01-10 09:56:48 +0000