summaryrefslogtreecommitdiffstats
path: root/adb/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of bc2168c9 to lmp-mr1-dev-plus-aospElliott Hughes2014-11-211-2/+0
|\ | | | | | | Change-Id: Ic53ce9bdb658838368b4e9029a1f7a4137dd0499
| * Remove the adb usb vendor id whitelist.Elliott Hughes2014-11-211-2/+0
| | | | | | | | | | | | | | If there are bad vendors, we should blacklist them. Whitelisting the entire world is crazy. Change-Id: I1f4c27fd34fc420e2a3b4b2c8749198030db69f1
| * am 2f431a8d: Fix windows-specific error without messing up Makefile flags.Stephen Hines2014-10-021-3/+0
| |\ | | | | | | | | | | | | * 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-011-3/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '64f44b8444dabd69cf391d42e10d44e8e926a79d': Remove obsolete reference to ddk; Fixes for -Werror
* | \ \ \ resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-101-1/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I6b62347c3acfda7c2c954e719547021009d20c01
| * | | | | Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""Paul Lawrence2014-10-091-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-14/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I9ff777a6309aab2b5b18323dd4ee7617cb1c3180
| * | | | | Revert "Enable verity on userdebug, and add disable-verity to adb"Nick Kralevich2014-10-081-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-1/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: Icdc9306b460c116441aad21bfcf3ab549224a141
| * | | | | Enable verity on userdebug, and add disable-verity to adbPaul Lawrence2014-10-081-1/+14
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 17691572 Change-Id: I58f588f318e7952d06a41325337d946d7c007e31
* | | | | am a866e5a8: am 6cf1193b: am 2f431a8d: Fix windows-specific error without ↵Stephen Hines2014-10-021-3/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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-011-3/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-3/+1
|\ \ \ | |/ / | | / | |/ |/| | | | | -Werror" into lmp-dev * commit '4acabfee9e00962be02d06a6771da2e7ade20859': Remove obsolete reference to ddk; Fixes for -Werror
| * Remove obsolete reference to ddk; Fixes for -WerrorAndrew Hsieh2014-09-301-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14416410 1. The new mingw-w64 toolchain x86_64-w64-mingw32-4.8 has ddk in x86_64-w64-mingw32/include/ddk 2. Add -Wno-error=cpp to suppress a warning that turns into error thanks to -Werror: Please include winsock2.h before windows.h 3. Cast GetLastError() return type DWORD to "int" 4. Include direct.h for _mkdir 5. Include stdint.h for uint8_t on Windows Change-Id: I4bec0587f6573692f08c760da6c98ae551b8b5eb
* | am fc8e16bf: am 2c805883: Merge "Add -Wno-deprecated-declarations to makefiles."Christopher Ferris2014-09-061-2/+10
|\ \ | | | | | | | | | | | | * commit 'fc8e16bfc59fcebaf554e266aae808eed5f2d078': Add -Wno-deprecated-declarations to makefiles.
| * | Add -Wno-deprecated-declarations to makefiles.Christopher Ferris2014-09-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for an update to the uapi v3.16.1 kernel headers that marks the structure usb_functionfs_descs_head as deprecated. Change-Id: I25d2f32ce8e95e038e6df201ce2f8126f5a8b6fa
* | | am 5a255238: Merge "Redirect debug output to logcat." into lmp-devleozwang2014-07-251-1/+1
|\ \ \ | |/ / |/| / | |/ | | * commit '5a2552388e698fec4efda270d2d88bb18ed3f299': Redirect debug output to logcat.
| * Redirect debug output to logcat.leozwang2014-07-231-1/+1
| | | | | | | | | | | | If ADB_TRACE is enabled, debug output will be redirected to logcat. Change-Id: I9c36ada7690a2b946ecd6a926d04e36a8313c36a
| * Add "exec" service: shell commands with no pty.Jeff Sharkey2014-05-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To facilitate device scripts that want to read/write binary data from the host side, this change introduces a new "exec" service that behaves like "shell" but without creating a pty, which would otherwise mangle binary data. After forking, it hooks up stdin/stdout of the child process to the socket connected through to the host. The adb transport doesn't support shutdown(), so the host can't half-close the socket and wait for device termination. Instead, the host side now has two explicit commands "exec-in" and "exec-out" for either sending or receiving data. Teach host side copy_to_file() to deal with stdin/stdout special cases. Switch device side backup/restore services to use the new create_subproc_raw under the hood. Change-Id: I5993049803519d3959761f2363037b02c50920ee
* | fix adb build on DarwinTim Murray2014-07-241-0/+1
| | | | | | | | | | | | bug 16172793 Change-Id: Ia34b7148afc4c909f29037df91c04d6fd29a731e
* | Add "exec" service: shell commands with no pty.Jeff Sharkey2014-07-181-1/+0
|/ | | | | | | | | | | | | | | | | | | | | | To facilitate device scripts that want to read/write binary data from the host side, this change introduces a new "exec" service that behaves like "shell" but without creating a pty, which would otherwise mangle binary data. After forking, it hooks up stdin/stdout of the child process to the socket connected through to the host. The adb transport doesn't support shutdown(), so the host can't half-close the socket and wait for device termination. Instead, the host side now has two explicit commands "exec-in" and "exec-out" for either sending or receiving data. Teach host side copy_to_file() to deal with stdin/stdout special cases. Switch device side backup/restore services to use the new create_subproc_raw under the hood. (cherry picked from commit 5d9d434efadf1c535c7fea634d5306e18c68ef1f) Change-Id: I42c18cb5bb907449b458c94450ef6c584d84ecdb
* Merge changes Idfd1a114,If725a1cb,I61211165,If9a05ccbMark Salyzyn2014-05-071-4/+3
|\ | | | | | | | | | | | | | | * changes: adb: turn on -Werror netcfg: turn on -Werror mkbootimg: turn on -Werror gpttool: turn on -Werror
| * adb: turn on -WerrorMark Salyzyn2014-05-051-4/+3
| | | | | | | | | | | | - Deal with some -Wunused issues Change-Id: Idfd1a114e68ae637978b52fde5144d0dca0ec79f
* | Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-2/+0
|/ | | | Change-Id: I42aeb7668183e7a06207ee063f6eee4d37d66c6e
* adb: deprecate legacy log service interfaceMark Salyzyn2014-01-271-2/+1
| | | | | | (cherry picked form commit c66a7537df987715acc77eed952111cc56b7e72b) Change-Id: If96019cc13b3d7a4dcd7785c7137e0cbcc622981
* adb: regression from Move list.c to inlinesMark Salyzyn2014-01-271-1/+1
| | | | | | (cherry picked from commit 5f64d528be2ca7229c0e9ce00837ac0fa4da2e54) Change-Id: I057dbe3db80b1460f774e9f9ade11e0929529ec6
* adb: configure /system file permission with fs_configLiang Cheng2014-01-021-1/+1
| | | | | | | | | | | | | | | | | adbd changes the permissions of files uploaded by copying owner's permission to group and other. This causes kernel load failure if any changes are made to kernel modules followed by ``adb push'' or ``adb sync'' because file mode 644 would become 666. The change uses fs_config to get the target mode of files. In addition, the SELinux file label is set incorrectly on synced files. Set the label properly. Change-Id: I354db848f39adfbf189d7e8d3b028e8d763c772f Signed-off-by: Liang Cheng <licheng@nvidia.com> Bug: 12264775
* Move liblog headers to system/core/include/logColin Cross2013-07-241-1/+1
| | | | | | | | | Move the liblog headers to log/ instead of cutils/ to complete the separation of libcutils and liblog. cutils/log.h still exists and includes log/log.h in order to support the many existing modules that use cutils/log.h. Change-Id: I2758c9f4aedcb809ca7ba8383d0f55041dd44345
* adb: Cleanup dead codeBenoit Goby2013-04-241-4/+1
| | | | | | | dns_service is unused and recover_service has been replaced by adb sideload Change-Id: Ie90000d7f672e8299ee1622a9690c7371b214dc1
* resolved conflicts for merge of f62f1e3a to masterYing Wang2013-01-101-2/+2
|\ | | | | | | Change-Id: I35c66859e2c454c20c8acc6b2b1f0833032205bb
| * Correct LOCAL_LDLIBS of adbChih-Wei Huang2013-01-011-2/+2
| | | | | | | | | | | | | | | | | | adb doesn't really use ncurses-libs, remove it. Add -ldl for the symbols dlclose, dlerror, dlopen... introduced from dso_dlfcn.c of libcrypto_static.a. Change-Id: If1cc23987a9b35ec535bbf8f4e7db141b9f10af7
* | adb: HACK: (linux only) allow temp mitigation for multithreaded issuesJP Abgrall2013-01-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are serious multithreading issues between the fdevent and transport subsystems which both manipulate struct asocket and struct fde concurrently. The prevalent symptom being around multiple socket closures which stomp on each other, typically causing: "glibc detected *** adb: double free or corruption ..." This HACK allows forcing CPU affinity via an env var. E.g.: export ADB_CPU_AFFINITY_BUG6558362=0 which will cause ONLY the adb server and all its threads to be pegged to CPU 0. The result is visible in valgrind's helgrind: no *socket_close() related data races. But tons of other races are still there. Bug: 6558362 Change-Id: I0f112390a6a921c64b2a783297be9e99ce27fd56
* | Host builds: add fastboot and adbKenny Root2012-09-261-0/+1
|/ | | | | | | Add fastboot and adb host utilities to debug builds for debugging and development purposes. Change-Id: If77699a27497b8641998930f14d4ee418b856080
* Dist fastboot and adb for the sdk build.Ying Wang2012-09-051-1/+1
| | | | | | | So they can be downloaded from the build page. Bug: 7109694 Change-Id: Ibc60d0acbc5d2445c01010fd0bd4654a240b0a88
* adb: Link statically with libcryptoBenoit Goby2012-08-311-5/+3
| | | | | Bug: 7063951 Change-Id: I328b76a751aceaae625d64156f22ce3de65678c8
* adb: Add public key authentificationBenoit Goby2012-08-231-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Secure adb using a public key authentication, to allow USB debugging only from authorized hosts. When a device is connected to an unauthorized host, the adb daemon sends the user public key to the device. A popup is shown to ask the user to allow debugging once or permanantly from the host. The public key is installed on the device in the later case. Other keys may be installed at build time. On the host, the user public/private key pair is automatically generated, if it does not exist, when the adb daemon starts and is stored in $HOME/.android/adb_key(.pub) or in $ANDROID_SDK_HOME on windows. If needed, the ADB_KEYS_PATH env variable may be set to a :-separated (; under Windows) list of private keys, e.g. company-wide or vendor keys. On the device, vendors public keys are installed at build time in /adb_keys. User-installed keys are stored in /data/misc/adb/adb_keys. ADB Protocol change: If the device needs to authenticate the host, it replies to CNXN packets with an AUTH packet. The AUTH packet payload is a random token. The host signs the token with one of its private keys and sends an AUTH(0) packet. If the signature verification succeeds, the device replies with a CNXN packet. Otherwise, it sends a new AUTH packet with a new token so that the host can retry with another private key. Once the host has tried all its keys, it can send an AUTH(1) packet with a public key as payload. adbd then sends the public key to the framework (if it has been started) for confirmation. Change-Id: I4e84d7621da956f66ff657245901bdaefead8395
* Revert "adb: Add public key authentification"Benoit Goby2012-08-201-13/+2
| | | | This reverts commit f4ed516643ee8ed3a59ad1a8048f7ce5f47f93fb.
* adb: Add public key authentificationBenoit Goby2012-08-161-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Secure adb using a public key authentication, to allow USB debugging only from authorized hosts. When a device is connected to an unauthorized host, the adb daemon sends the user public key to the device. A popup is shown to ask the user to allow debugging once or permanantly from the host. The public key is installed on the device in the later case. Other keys may be installed at build time. On the host, the user public/private key pair is automatically generated, if it does not exist, when the adb daemon starts and is stored in $HOME/.android/adb_key(.pub) or in $ANDROID_SDK_HOME on windows. If needed, the ADB_KEYS_PATH env variable may be set to a ;-separated list of private keys, e.g. company-wide or vendor keys. On the device, vendors public keys are installed at build time in /adb_keys. User-installed keys are stored in /data/misc/adb/adb_keys. ADB Protocol change: If the device needs to authenticate the host, it replies to CNXN packets with an AUTH packet. The AUTH packet payload is a random token. The host signs the token with one of its private keys and sends an AUTH(0) packet. If the signature verification succeeds, the device replies with a CNXN packet. Otherwise, it sends a new AUTH packet with a new token so that the host can retry with another private key. Once the host has tried all its keys, it can send an AUTH(1) packet with a public key as payload. adbd then sends the public key to the framework (if it has been started) for confirmation. Change-Id: Idce931a7bfe4ce878428eaa47838e5184ac6073f
* adb: Remove unused flagsBenoit Goby2012-03-161-18/+0
| | | | | | | | | BUILD_ADBD is always true ANDROID_GADGET is not used in the code anymore. adbd now checks at runtime if /dev/android_adb is present Change-Id: If6c3278606c79cc74d1ef5978e7b8e3a4513aef8
* Don't allow adb to run as root in user builds.Nick Kralevich2012-01-191-0/+4
| | | | Change-Id: I4fbd7beb7f76c68fead1a89b745f0dfb931b4597
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-15/+3
| | | | | | Bug: 5010576 Change-Id: I2fcf31af681d92880e5d31a46d5f6777f7ca1977
* Add 'adb restore' to parallel 'adb backup'Christopher Tate2011-05-171-1/+0
| | | | | | | | | It won't actually do anything until the 'bu' tool and framework are updated to respond properly, but this is the adb side of the necessary infrastructure: we copy the tarfile into the socket pointed at the device, using the existing mechanisms. Change-Id: Ic3b5779ade256bd1ad989a94b0685f7b1a7d59d2
* Add 'adb backup' for pulling a full backup tarfile to the hostChristopher Tate2011-04-271-0/+2
| | | | | | | The direct command interfaces with the 'bu' binary in /system/bin on the device. Change-Id: I4cd69eedfe5144c47277573c5626c6ad8755d70b
* dist for dist_filesYing Wang2010-12-091-1/+1
| | | | Change-Id: I665572a2212f1239b02b7816e37ada210afbdb48
* Don't build adb for sdk only buildsBenoit Goby2010-10-061-0/+2
| | | | | Change-Id: I0c56213e81a889fd3a7c5e72c4a6e63544a2a3bd Signed-off-by: Benoit Goby <benoit@android.com>
* Don't build adb for simulator targetBenoit Goby2010-10-061-0/+2
| | | | | Change-Id: Ibe4ef6bb111dc7123e53262553deb8f5e25e9391 Signed-off-by: Benoit Goby <benoit@android.com>
* Build adb for target-as-hostJohn Michelau2010-10-051-0/+40
| | | | | | | | | | Added a new target for adb, so that the adb host executable is built for the target as well. This allows the target to connect to any Android devices which are attached to it. Bug: 3022194 Change-Id: Ib01983e70b75cec40a9ee161da7f4cf1343eecf2