Yabin Cui
e77b6a0862
kill HAVE_FORKEXEC
...
Bug: 18317407
Change-Id: I4eecb3c9d745e3dabfc46fa595aac7f94f6d93e3
2014-11-12 17:06:27 -08:00
Elliott Hughes
2655256570
am 452f08a0: Merge "Add razer usb vid for future use with adb"
...
* commit '452f08a0b78e65cbd7e4cddac133e59f94d5db4c':
Add razer usb vid for future use with adb
2014-11-05 02:42:04 +00:00
Stuart Wells
3410d33dc4
Add razer usb vid for future use with adb
...
Change-Id: I6b76c297de900da050473b764517cfd15c64b838
Signed-off-by: Stuart Wells <stuart.wells@razerzone.com>
2014-11-03 09:32:30 -08:00
JP Abgrall
cb3739b545
am 7e38ab47: am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH"
...
* commit '7e38ab476f808f84f0755ccbceb4cd7d8a1982a3':
adb: Add USB vendor ID for TrekStor GmbH
2014-10-20 18:38:24 +00:00
Thorsten Koroscha
4fa99e542f
adb: Add USB vendor ID for TrekStor GmbH
...
Change-Id: I1d7fc14e691b4ab504c5205b21c93939499cdff9
Signed-off-by: Thorsten Koroscha <t.koroscha@trekstor.de>
2014-10-20 10:26:20 +02:00
Stephen Hines
f17c42f68a
am 2f431a8d: Fix windows-specific error without messing up Makefile flags.
...
* commit '2f431a8d5a1c2029af470a7336751a555131ee51':
Fix windows-specific error without messing up Makefile flags.
2014-10-02 00:53:27 +00:00
Stephen Hines
2f431a8d5a
Fix windows-specific error without messing up Makefile flags.
...
Bug: 14416410
The proper fix for the error/warning we encountered is to move winsock2.h
in front of windows.h.
Change-Id: I29504ba3a184a85c6636d06c2ad900828fdb5436
2014-10-01 17:37:06 -07:00
Stephen Hines
d2ee707586
am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.
...
* commit '3ea87c33a1c6e940322f5436cf0dd70a0bdadd75':
Fix build breakage for missing -Wcpp option on old GCC versions.
2014-10-02 00:31:50 +00:00
Stephen Hines
3ea87c33a1
Fix build breakage for missing -Wcpp option on old GCC versions.
...
Bug: 14416410
Change-Id: Ib30c3739d50d6122b3b4643051c72f2fa4985686
2014-10-01 17:16:37 -07:00
Stephen Hines
1e95e0b19c
am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev
...
* commit '64f44b8444dabd69cf391d42e10d44e8e926a79d':
Remove obsolete reference to ddk; Fixes for -Werror
2014-10-01 23:21:09 +00:00
Stephen Hines
64f44b8444
Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev
2014-10-01 22:53:51 +00:00
Vince Harron
43aecc5436
am c75dac39: Merge "fix for adbd pinning CPU" into lmp-dev
...
* commit 'c75dac394e3fcd9760841a820d8a0c93dd0c276e':
fix for adbd pinning CPU
2014-09-30 14:56:25 +00:00
Andrew Hsieh
b75d6f1429
Remove obsolete reference to ddk; Fixes for -Werror
...
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
2014-09-30 02:24:07 -07:00
Alex Klyubin
1f88f8ef32
am 9005ec37: am e3d3016d: Merge "Switch from using base64 BIOs to encoding funcs."
...
* commit '9005ec378ecd281f52945b5baca87245543bbfbf':
Switch from using base64 BIOs to encoding funcs.
2014-09-26 21:58:52 +00:00
Alex Klyubin
e3d3016d46
Merge "Switch from using base64 BIOs to encoding funcs."
2014-09-26 21:51:36 +00:00
Vince Harron
af436b1e10
fix for adbd pinning CPU
...
adbd was spinning between select & read (0 bytes) for an adb_auth
socket. The read documentation states: "On success, the number of
bytes read is returned (zero indicates end of file)" so the code has
been modified to close the connection (like the read error case).
BUG=17419868
Change-Id: I1d8fb70c8e1876225ba8d47ea0a2b6265a7d182b
2014-09-25 21:51:15 -07:00
Dan Albert
736fd4a870
am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2).""
...
* commit '8e1e54154bc7a5e9dee206735474186c2276b111':
Revert "Switch adb to epoll(2)."
2014-09-25 22:32:18 +00:00
Dan Albert
45741ae2ea
Revert "Switch adb to epoll(2)."
...
This reverts commit 67de1557b0
.
2014-09-25 15:10:34 -07:00
Elliott Hughes
0ab784d470
am 790e7c0a: am 3772545c: Merge "Switch adb to epoll(2)."
...
* commit '790e7c0ac46bca5ad511ba8764bbb0e9646c6f2a':
Switch adb to epoll(2).
2014-09-23 18:57:33 +00:00
Elliott Hughes
67de1557b0
Switch adb to epoll(2).
...
Bug: 17588403
Change-Id: I2590f5e7dd4e178ff4f743609c5ef0155b1015a1
2014-09-23 10:40:51 -07:00
Doug Zongker
edda73d0c8
fix windows build
...
(cherry-picked from commit 4b39c6aca9
)
Change-Id: Ia7b236f1a915630fe85d488072efb9784ba10dad
2014-09-16 10:59:49 -07:00
Kenny Root
d372c5c365
Merge changes I11e84a7b,I5adaedd8
...
* changes:
adb: fix 64-bit build
add sideload-host mode to adb
2014-09-16 17:36:13 +00:00
Colin Cross
52e0b61999
adb: fix 64-bit build
...
strlen returns a size_t, but the * modifier in printf expects an int.
On arm64 size_t != int.
(cherry-picked from commit 6d6a898b0c
)
Change-Id: I11e84a7b62c935162abc0aba910d14e63d11efd3
2014-09-16 10:31:30 -07:00
Doug Zongker
8e49ae4bb8
add sideload-host mode to adb
...
The sideload-host mode turns the host into a server capable of sending
the device various pieces of the file on request, rather than
downloading it all in one transfer. It's used to support sideloading
OTA packages to devices without the need for them to hold the whole
package in RAM.
If the connected device doesn't support sideload-host mode, we fall
back to the older sideload connection.
(cherry-picked from commit 71fe584a1a
)
Change-Id: I5adaedd8243dc3b76414bba0149879ca2bbf35fa
2014-09-16 10:27:38 -07:00
Esteban de la Canal
a5ab96eb50
74602: Fixes adb not seeing connected devices on Mac.
...
Every alternate time an adb server was started already connected devices were
not being seen. This was caused by opened usb connections being "stalled".
See this thread for more information: http://lists.apple.com/archives/usb/2011/Jun/msg00050.html
Change-Id: Ic35b7a66c3f14a837b960066557f44e105609dcb
Fixes: https://code.google.com/p/android/issues/detail?id=74602
2014-09-15 15:46:13 -07:00
Esteban de la Canal
da5b2d67fa
am 99bb69c1: am f41ee3d5: Merge "74602: Fixes adb not seeing connected devices on Mac."
...
* commit '99bb69c1cee678382bf5e48962aa444469b3310e':
74602: Fixes adb not seeing connected devices on Mac.
2014-09-12 21:43:43 +00:00
Esteban de la Canal
f41ee3d5a1
Merge "74602: Fixes adb not seeing connected devices on Mac."
2014-09-12 21:11:14 +00:00
Esteban de la Canal
9dd83dc96e
74602: Fixes adb not seeing connected devices on Mac.
...
Every alternate time an adb server was started already connected devices were
not being seen. This was caused by opened usb connections being "stalled".
See this thread for more information: http://lists.apple.com/archives/usb/2011/Jun/msg00050.html
Change-Id: Ic35b7a66c3f14a837b960066557f44e105609dcb
Fixes: https://code.google.com/p/android/issues/detail?id=74602
2014-09-11 11:36:50 -07:00
Elliott Hughes
8fa75e44f1
am 6608a46c: am c4ff0389: Merge "adb: Add USB vendor ID for Alco Digital Devices Limited"
...
* commit '6608a46c59abd72bd42a5104937fb276b6b0ccbd':
adb: Add USB vendor ID for Alco Digital Devices Limited
2014-09-10 18:26:35 +00:00
DanielMo
553630e423
adb: Add USB vendor ID for Alco Digital Devices Limited
...
Change-Id: I50d343d583e688e9f8a72d1c61618b384e310fe1
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-09-10 13:58:32 +08:00
Jeff Sharkey
84e533d7b0
am 228f8261: Merge "delete_file() should force removal." into lmp-dev
...
* commit '228f8261fd778e1c03184b5f79f979d1a25abf50':
delete_file() should force removal.
2014-09-09 21:56:14 +00:00
Jeff Sharkey
41b3cfa296
delete_file() should force removal.
...
It's a shell command with a pty, but it's not really interactive,
so force the removal to avoid giving users dead-end prompts.
Bug: 17339227
Change-Id: Iaf5d95c49f032066aa741a711a2c45557d93c598
2014-09-09 12:38:30 -07:00
Christopher Ferris
fb849bd46e
am fc8e16bf: am 2c805883: Merge "Add -Wno-deprecated-declarations to makefiles."
...
* commit 'fc8e16bfc59fcebaf554e266aae808eed5f2d078':
Add -Wno-deprecated-declarations to makefiles.
2014-09-06 17:25:48 +00:00
Christopher Ferris
2c80588340
Merge "Add -Wno-deprecated-declarations to makefiles."
2014-09-06 16:56:46 +00:00
Chih-Hung Hsieh
6d94763b2f
am 379ca94d: am 299a32c8: Merge "Include ADB_HOST only code in #if ADB_HOST."
...
* commit '379ca94d00cab91a77ad8991cc92e2b4d4236d56':
Include ADB_HOST only code in #if ADB_HOST.
2014-09-05 23:58:09 +00:00
Chih-Hung Hsieh
299a32c803
Merge "Include ADB_HOST only code in #if ADB_HOST."
2014-09-05 23:38:07 +00:00
Chih-Hung Hsieh
f787b381b6
Include ADB_HOST only code in #if ADB_HOST.
...
BUG: 17409892
Change-Id: Ic1199dd745191aba718fdb18343e87c0ccbe530b
2014-09-05 16:34:02 -07:00
Elliott Hughes
709569febf
am 0dcc3f65: am 9c814648: Merge "Add USB Vendor ID for Micromax Informatics Ltd."
...
* commit '0dcc3f65b1ff5fa771618436ee4bfdd44cd2f672':
Add USB Vendor ID for Micromax Informatics Ltd.
2014-09-05 23:31:15 +00:00
Abhishek Karmakar
4d10523be8
Add USB Vendor ID for Micromax Informatics Ltd.
...
Signed-off-by: Abhishek Karmakar <abhishek.karmakar@micromaxinfo.com>
Change-Id: I63462eb15575cc953ac0246ee5d4c883d3678c08
2014-09-05 16:06:25 -07:00
Adam Langley
179d9d6587
Switch from using base64 BIOs to encoding funcs.
...
The OpenSSL base64 BIO is going away in BoringSSL. This change switches
to using the explicit base64 functions which are availible in both
OpenSSL and BoringSSL. The BoringSSL helper functions (i.e. for
calculating the size of the base64 encoding) are wrapped in #ifdefs so
that this change isn't coupled with the switch to BoringSSL. Once that
switch is complete, the #ifdefs can be removed.
Bug: 17409664
Change-Id: I42bac3bc93a1fb39feed39a8917d8e38d97629d3
Signed-off-by: Adam Langley <agl@google.com>
2014-09-05 15:54:30 -07:00
Christopher Ferris
51448eb39e
Add -Wno-deprecated-declarations to makefiles.
...
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
2014-09-04 16:13:42 -07:00
Ying Wang
0c3d98b02b
am 87ad7cdc: am e1ba39aa: Merge "Fix 64-bit host build."
...
* commit '87ad7cdc590aa4033f0b7ae23d83e2fbc119d07a':
Fix 64-bit host build.
2014-08-14 23:20:06 +00:00
Ying Wang
42a809ba06
Fix 64-bit host build.
...
Bug: 13751317
Change-Id: Ibf62935b7d12a55ffc57242a26a2581b52796847
2014-08-14 15:52:54 -07:00
Elliott Hughes
e772705a59
am 771f6f29: am 29c5a78f: Merge "Fix build of adb with gcc-4.9."
...
* commit '771f6f299f16704b251d6adb8fb185c8fb517d07':
Fix build of adb with gcc-4.9.
2014-08-06 18:06:33 +00:00
Alexander Ivchenko
678bd2e822
Fix build of adb with gcc-4.9.
...
Without this patch we get:
system/core/adb/commandline.c:1629:16: error: array subscript is above
array bounds [-Werror=array-bounds]
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
(cherry picked from commit 5372333885
)
Change-Id: I920c1de933ce5ba0a0d57eb8a9b557325a767a2a
2014-08-06 10:59:53 -07:00
Brian Carlstrom
8a01917da1
am 46a8ffe8: Fix Windows adb build by avoiding "bool"
...
* commit '46a8ffe87f3cba070fb18a90e3c5c1f73468f99c':
Fix Windows adb build by avoiding "bool"
2014-08-06 12:57:22 +00:00
Brian Carlstrom
46a8ffe87f
Fix Windows adb build by avoiding "bool"
...
Change-Id: I9ca59e400c199d497a1a18d5e64c2cafe628097b
2014-08-05 22:51:18 -07:00
Jeff Sharkey
8c9b155ea1
am 43d65b69: Merge "Escape single quotes in arguments." into lmp-dev
...
* commit '43d65b6903249a409031b081bb6175b9ad3e5c2a':
Escape single quotes in arguments.
2014-08-06 01:23:28 +00:00
Elliott Hughes
440df7b61f
am 830a8641: am a8d0c4a2: Merge "Move host \'get-state\' service up so that it works."
...
* commit '830a8641bb960d208ad2a5b3bc3d9fb91bc31c2b':
Move host 'get-state' service up so that it works.
2014-08-06 01:22:09 +00:00
Elliott Hughes
29c5a78fdc
Merge "Fix build of adb with gcc-4.9."
2014-08-05 00:30:25 +00:00