Commit graph

811 commits

Author SHA1 Message Date
Elliott Hughes
b99dbe9aaf am 4c2aec09: am aa3e17e1: Merge "Return path including executable instead of without"
* commit '4c2aec09cf2da437f3995ff4cac87e4c20d1d4b0':
  Return path including executable instead of without
2014-11-20 18:47:24 +00:00
Elliott Hughes
4c2aec09cf am aa3e17e1: Merge "Return path including executable instead of without"
* commit 'aa3e17e1b685218cddeb7a05e68ff1721a322147':
  Return path including executable instead of without
2014-11-20 18:43:12 +00:00
Elliott Hughes
330c3ee944 am 1bc314d3: am 51184950: Merge "Disable vendor id filtering for Linux."
* commit '1bc314d3dda8a2e34d48c3811c0b29b9135f9051':
  Disable vendor id filtering for Linux.
2014-11-20 18:40:04 +00:00
Elliott Hughes
1bc314d3dd am 51184950: Merge "Disable vendor id filtering for Linux."
* commit '511849507a7b2f4e259f6763c62f0c8619977b06':
  Disable vendor id filtering for Linux.
2014-11-20 18:36:18 +00:00
Elliott Hughes
aa3e17e1b6 Merge "Return path including executable instead of without" 2014-11-20 18:35:12 +00:00
Al Sutton
26b53bb75e Return path including executable instead of without
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
2014-11-20 13:33:57 +00:00
Elliott Hughes
55664906a8 Disable vendor id filtering for Linux.
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
2014-11-19 22:07:34 -08:00
Elliott Hughes
6309cb35f7 am 2097e9a1: am 20860a28: Merge "Fix building on modern versions of Xcode and OS X."
* commit '2097e9a1491e850545cd0c38522c22dafd2cf6af':
  Fix building on modern versions of Xcode and OS X.
2014-11-19 22:00:18 +00:00
Elliott Hughes
2097e9a149 am 20860a28: Merge "Fix building on modern versions of Xcode and OS X."
* commit '20860a28c5be013da111cb794c92dae02aa30089':
  Fix building on modern versions of Xcode and OS X.
2014-11-19 21:55:28 +00:00
Al Sutton
f456d47c50 Fix building on modern versions of Xcode and OS X.
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
2014-11-19 19:50:48 +00:00
Elliott Hughes
cc1be8520f am eda507e4: am 0655d38b: Merge "Revert "adb: Add USB vendor ID for Honeywell""
* commit 'eda507e4921bf6f027d88433fc4e15f4b860046d':
  Revert "adb: Add USB vendor ID for Honeywell"
2014-11-18 21:29:14 +00:00
Elliott Hughes
eda507e492 am 0655d38b: Merge "Revert "adb: Add USB vendor ID for Honeywell""
* commit '0655d38b0c998f294ad52f1f8e84233a48046e97':
  Revert "adb: Add USB vendor ID for Honeywell"
2014-11-18 21:23:58 +00:00
Elliott Hughes
0655d38b0c Merge "Revert "adb: Add USB vendor ID for Honeywell"" 2014-11-18 21:15:44 +00:00
Elliott Hughes
3e01bb85d6 Revert "adb: Add USB vendor ID for Honeywell"
This reverts commit 8c4c8e8988.

Change-Id: Ia1cad862f42e5bea3174ed2cc0eea5232fc0a858
2014-11-18 21:15:28 +00:00
Yabin Cui
bd51f58e08 am 0aa45710: am 6a56ad28: Merge "kill HAVE_TERMIO_H"
* commit '0aa45710d5c850bf673b14cf4894cee8eb43ce9b':
  kill HAVE_TERMIO_H
2014-11-18 20:19:12 +00:00
Yabin Cui
0aa45710d5 am 6a56ad28: Merge "kill HAVE_TERMIO_H"
* commit '6a56ad28c385ad799f25a1b90213b2367fcb9e22':
  kill HAVE_TERMIO_H
2014-11-18 02:32:53 +00:00
Yabin Cui
d325e866c4 kill HAVE_TERMIO_H
Bug: 18398307
Change-Id: Idbb89a074cdf16869cae3f667e89472781f37a5f
2014-11-17 18:19:11 -08:00
Nick Kralevich
33aacf1963 Introduce "adb keygen"
automerge: 86c9e5f

* commit '86c9e5f7e20a3f1712038ce642628c2e1e866434':
  Introduce "adb keygen"
2014-11-17 18:56:25 +00:00
Nick Kralevich
86c9e5f7e2 Introduce "adb keygen"
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 af782b9f2a)

Change-Id: Ic76ffc9412171dddc879af0bbf6e20fbe1a8f057
2014-11-14 21:09:48 +00:00
Nick Kralevich
f43499ce72 Merge "Introduce "adb keygen"" 2014-11-14 20:56:14 +00:00
Nick Kralevich
af782b9f2a Introduce "adb keygen"
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
2014-11-14 11:22:46 -08:00
Yabin Cui
6b2dd14f5f am 30db2d25: am c9582d02: Merge "kill HAVE_FORKEXEC"
* commit '30db2d259369efccde665ac15cc5930a540fac58':
  kill HAVE_FORKEXEC
2014-11-14 19:15:43 +00:00
Yabin Cui
30db2d2593 am c9582d02: Merge "kill HAVE_FORKEXEC"
* commit 'c9582d02391393d38b511f8c58be5429bdcb0406':
  kill HAVE_FORKEXEC
2014-11-13 23:35:24 +00:00
Yabin Cui
e77b6a0862 kill HAVE_FORKEXEC
Bug: 18317407
Change-Id: I4eecb3c9d745e3dabfc46fa595aac7f94f6d93e3
2014-11-12 17:06:27 -08:00
Christopher Ferris
8e8ae85754 am ae7bf095: Fix adb/fastboot windows compilations.
* commit 'ae7bf0959bd3f79afbf365e41f015ed1c304afdc':
  Fix adb/fastboot windows compilations.
2014-11-07 03:49:08 +00:00
Christopher Ferris
0eabf64ce0 Fix adb/fastboot windows compilations.
Many of the windows files where not including stdlib.h even though they
are using malloc/free calls.

Bug: 18283958
(cherry picked from commit ae7bf0959b)

Change-Id: Iebc09cc314fa8f0ba6c6cd45ba26135052f156dd
2014-11-06 18:32:39 -08:00
Christopher Ferris
ae7bf0959b Fix adb/fastboot windows compilations.
Many of the windows files where not including stdlib.h even though they
are using malloc/free calls.

Change-Id: If6959df9909d9d9928e9f4a2a96018166361cf3c
2014-11-06 14:34:24 -08:00
Elliott Hughes
7e34ab181a am 1635b81b: am 26552565: am 452f08a0: Merge "Add razer usb vid for future use with adb"
* commit '1635b81b22abeb930feb02c63a1f5678a1386231':
  Add razer usb vid for future use with adb
2014-11-05 03:29:44 +00:00
Elliott Hughes
1635b81b22 am 26552565: am 452f08a0: Merge "Add razer usb vid for future use with adb"
* commit '2655256570b7c1c5af6d886735835eecb99f45f2':
  Add razer usb vid for future use with adb
2014-11-05 02:57:28 +00: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
Badhri Jagan Sridharan
e124f24c5b Merge "adbd & fastbootd: Support for new f_fs descriptor format" 2014-10-28 17:30:40 +00:00
Paul Lawrence
d1abdeac3e am 6331781a: Merge "adb warns on remount when verity is enabled" into lmp-mr1-dev automerge: 3dbcc8b
* commit '6331781a7507c4c3f86c37781cc715baaaa9814c':
  adb warns on remount when verity is enabled
2014-10-28 07:15:29 +00:00
Badhri Jagan Sridharan
fad60336da adbd & fastbootd: Support for new f_fs descriptor format
The patch "[RFC] usb: gadget: f_fs: Add flags
to  descriptors block" marks the current
usb_functionfs_descs_head format deprecated
and introduces support for sending SuperSpeed
descriptors.

This CL makes adbd to send Descriptors in the
new format. Adbd would fall back to the old
format, if kernel is not able to recognize
the new format. This is done to prevent
adbd from breaking in the older versions
of the kernel.

Bug: 17394972
Change-Id: I05095ccdcc74bf6953cbef847d7583eab137e12e
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
2014-10-28 01:59:17 +00:00
Paul Lawrence
6331781a75 Merge "adb warns on remount when verity is enabled" into lmp-mr1-dev
automerge: 3dbcc8b

* commit '3dbcc8b9332cdbaa0dae47a6cae3a043f96262fe':
  adb warns on remount when verity is enabled
2014-10-28 00:25:30 +00:00
Paul Lawrence
f643beced1 adb warns on remount when verity is enabled
Bug: 18119147
Change-Id: I75e5edf83fa01dbf2495e24df4597dce41f13654
2014-10-27 10:56:31 -07:00
JP Abgrall
6d463a5f41 am 1b338c67: am 7e38ab47: am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH"
* commit '1b338c6784cfe040a74acb58a6c6902d9cab3d8f':
  adb: Add USB vendor ID for TrekStor GmbH
2014-10-20 18:44:39 +00:00
JP Abgrall
1b338c6784 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:37 +00: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
Paul Lawrence
4e41eede41 am 6e9857da: resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aosp
* commit '6e9857da67d46d658e28f73500f08182a9b15b7e':
  Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""
2014-10-10 16:53:17 +00:00
Paul Lawrence
6e9857da67 resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aosp
Change-Id: I6b62347c3acfda7c2c954e719547021009d20c01
2014-10-10 09:07:21 -07:00
Paul Lawrence
a37c834b57 am c638c664: resolved conflicts for merge of a49bfc0d to lmp-mr1-dev-plus-aosp
* commit 'c638c6647d0a8e30b2e176e36b1c08ef57766f06':
  Revert "Enable verity on userdebug, and add disable-verity to adb"
2014-10-09 22:27:09 +00:00
Paul Lawrence
c638c6647d resolved conflicts for merge of a49bfc0d to lmp-mr1-dev-plus-aosp
Change-Id: I9ff777a6309aab2b5b18323dd4ee7617cb1c3180
2014-10-09 15:17:23 -07:00
Paul Lawrence
6841aefbbc am cc496dbc: resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aosp
* commit 'cc496dbcd709230c35016e3d84ad06d1e44de9b8':
  Enable verity on userdebug, and add disable-verity to adb
2014-10-09 21:34:38 +00:00
Paul Lawrence
cc496dbcd7 resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aosp
Change-Id: Icdc9306b460c116441aad21bfcf3ab549224a141
2014-10-09 13:24:06 -07:00
Paul Lawrence
bbb3631911 Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""
This reverts commit 152d2d4234.

Fixed build error, and also fixed memory leak spotted from warning.

Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
2014-10-09 09:05:36 -07:00
Nick Kralevich
152d2d4234 Revert "Enable verity on userdebug, and add disable-verity to adb"
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 d4cea0bc16.

Change-Id: I6862cc79ef9d944a2472b6fb2e46dae514cea8ce
2014-10-08 23:55:05 +00:00
Paul Lawrence
d4cea0bc16 Enable verity on userdebug, and add disable-verity to adb
Bug: 17691572

Change-Id: I58f588f318e7952d06a41325337d946d7c007e31
2014-10-08 15:24:37 -07:00
Stephen Hines
f39f24df24 am 0d8b1bdc: am a866e5a8: am 6cf1193b: am 2f431a8d: Fix windows-specific error without messing up Makefile flags.
* commit '0d8b1bdcce553a60fb9112ca403c00ad9d8842a5':
  Fix windows-specific error without messing up Makefile flags.
2014-10-02 13:53:01 +00:00