Commit graph

11363 commits

Author SHA1 Message Date
Elliott Hughes
81784ae8dd Merge "Lose chmod to toybox." 2014-12-11 20:50:52 +00:00
Chih-Hung Hsieh
59970e7041 Fix clang compiler warning.
commands.c:176:9: error: comparison of array 'path' equal to a null pointer is always false
[-Werror,-Wtautological-pointer-compare]

Change-Id: If6253e948ce219c76e9303e5ae39024094294182
2014-12-11 12:38:46 -08:00
Elliott Hughes
98c80a0f40 Lose chmod to toybox.
Change-Id: I358f1761238b48f2de94cc43716581d24c846edd
2014-12-11 12:13:25 -08:00
Chih-Hung Hsieh
3570072c36 Merge "Use full qualified name in macros." 2014-12-11 19:40:54 +00:00
Chih-Hung Hsieh
c777f213b3 Use full qualified name in macros.
The ANDROID_SINGLETON_STATIC_INSTANCE is used in some files
out of the android namespace. If it does not use full qualified
names, users of this macro will need to use it inside the 'android'
namespace to avoid warnings from clang compiler.

Change-Id: Ie4d4ba2b57fdc72d0deb3b7c2326304a44a1300f
2014-12-11 11:19:57 -08:00
Chih-Hung Hsieh
de180fc283 Merge "Remove unused local variable." 2014-12-10 22:19:19 +00:00
Chih-Hung Hsieh
058932c4ff Remove unused local variable.
Clang compiler gives it a warning and error.

Change-Id: Id35b740e265b393b5e31e05bd83544f391d8ff08
2014-12-10 14:14:09 -08:00
dcashman
250d1d1bf3 Merge "Move property_context label handling to libselinux." 2014-12-10 21:55:37 +00:00
dcashman
05345bfdb0 Move property_context label handling to libselinux.
Resubmission of commit: dab91bd37af6be355163ee33ca6f1b00e7dd1b51

Change-Id: Iad9517d3f81f7c091307b3e7497675e2cdc32be5
2014-12-10 13:21:17 -08:00
Dmitriy Ivanov
765f371cf4 Merge "Print ASCII near register for all archs" 2014-12-10 18:58:56 +00:00
Marco Nelissen
5eb431180b Merge "Allow updates for open file descriptors" 2014-12-10 18:50:08 +00:00
Marco Nelissen
a80f0986bb Allow updates for open file descriptors
even if the calling process itself would not be able to open the file.

Bug: 18688419

Change-Id: I640db19f19c1a677735fd0c14b7e2e38977d0f4d
2014-12-10 10:44:20 -08:00
Dmitriy Ivanov
052fc0a225 Print ASCII near register for all archs
Bug: 17880617
Change-Id: I6870e8ac670c08e45d8efb64479976a38edfdc93
2014-12-10 10:21:12 -08:00
Elliott Hughes
65c06de762 Merge "kill libunz" 2014-12-10 18:06:10 +00:00
Yabin Cui
71a968602d kill libunz
Bug: 18571533
Change-Id: I4214f9236f80629152d969a6ee9fce489079cefa
2014-12-09 22:24:07 -08:00
Elliott Hughes
a97c107554 Merge "Fix Nick's nits" 2014-12-10 03:38:57 +00:00
Paul Lawrence
88a12fb381 Fix Nick's nits
(cherry-pick of 97e487311b1cb780dfd3b0994917c72047d6188f.)

Change-Id: Ide7925e7ad328f0343d444d63ff72f1a26206d4c
2014-12-09 19:38:23 -08:00
Elliott Hughes
294e610f88 Merge "Fix verity on system partitions larger than 2G" 2014-12-10 03:34:43 +00:00
Sami Tolvanen
02c698d93f Fix verity on system partitions larger than 2G
If the system partition is larger than 2G, the device fails to read
verity metadata, because fseek accepts only a 32-bit signed offset.
Switch from fseek to lseek64 to allow seeking using a 64-bit offset,
which solves the problem. At the same time, move away from stdio in
the function.

(cherry-pick of 4cafe2ff89b49329e0e880900195d8e061bd3750.)

Bug: 17705619
Change-Id: I226320498dcb750ec6cde84411c7fe0774c9cab7
2014-12-09 19:34:08 -08:00
Riley Andrews
cbdf4a95aa Merge "Fix some style issues in adb_commandline()." 2014-12-10 02:26:59 +00:00
Riley Andrews
0dc15b3a23 Merge "Refactor the host adb argument parsing loop to remove a goto" 2014-12-10 02:26:51 +00:00
Nick Kralevich
c43ca87406 Merge "Revert "Move property_context label handling to libselinux."" 2014-12-10 02:03:56 +00:00
Nick Kralevich
59f64ec31f Revert "Move property_context label handling to libselinux."
Emulator fails to boot.

This reverts commit 98069027bd.

Bug: 18692152
Change-Id: If362e1311bc3f07e033ba81190c05608ada7c361
2014-12-10 02:02:32 +00:00
Riley Andrews
98f58e83c0 Fix some style issues in adb_commandline().
Change-Id: I8ed7899e7e137405594b3f3cbb0a87eae411dfc9
2014-12-09 17:25:39 -08:00
Riley Andrews
c8514c886e Refactor the host adb argument parsing loop to remove a goto
Change-Id: I3412ac473abc4efa51a6275658e65f7191b5439d
2014-12-09 17:25:39 -08:00
Elliott Hughes
55c38f728a Merge "Fix build" 2014-12-10 01:06:27 +00:00
Paul Lawrence
1d931bca26 Fix build
(cherry-pick of 731136ca36bb7af1490856373d463e3a6c4df1c8.)

Change-Id: I9b493fd5fc5c5f62f02bc5234ccca2a5118380b4
2014-12-09 17:06:00 -08:00
Elliott Hughes
18237c77c8 Merge "Add adb enable-verity" 2014-12-10 01:05:20 +00:00
Paul Lawrence
982089d838 Add adb enable-verity
Note that it is *easy* to break your phone with this feature. It is
not a bug that reenabling verity after changing one byte of the system
partition stops the device booting.

(cherry-pick of 7c442e1700e6312727283db402dec6f666f1b55a.)

Bug: 18529433
Change-Id: I632e91281884471a362960f1ba30312d2669b8ff
2014-12-09 17:04:43 -08:00
Elliott Hughes
b471f5249b Merge "Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""" 2014-12-10 01:03:25 +00:00
Paul Lawrence
ec900bba20 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.

(cherry-pick of bbb36319119edde9377fb80015235893c30d2bc9.)

Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
2014-12-09 17:02:17 -08:00
Elliott Hughes
7a497e3b5c Merge "adb warns on remount when verity is enabled" 2014-12-10 00:35:39 +00:00
Paul Lawrence
34637555c2 adb warns on remount when verity is enabled
(cherry-pick of f643beced1d154726dca7115014d2d1fdfcca993.)

Bug: 18119147
Change-Id: I75e5edf83fa01dbf2495e24df4597dce41f13654
2014-12-09 16:32:26 -08:00
Elliott Hughes
e1fb089945 Merge "fastbootd: Use FASTBOOT constants instead of ADB constants" 2014-12-10 00:27:09 +00:00
Badhri Jagan Sridharan
e3c72fd51a fastbootd: Use FASTBOOT constants instead of ADB constants
(cherry-pick of ae17fb8f24c2d4dbb000c8943e2caa428fbf4c9b.)

Change-Id: I4a67e7144b5c4a10e809821feb7f8c16540831cb
2014-12-09 16:26:25 -08:00
Elliott Hughes
83b4047bc6 Merge "adbd & fastbootd: Support for new f_fs descriptor format" 2014-12-10 00:25:51 +00:00
Badhri Jagan Sridharan
ab3446dd34 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.

(cherry-pick of fad60336daa5a7adf82d8140cbddd1c735770e71.)

Bug: 17394972
Change-Id: I05095ccdcc74bf6953cbef847d7583eab137e12e
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
2014-12-09 16:20:15 -08:00
Elliott Hughes
1dbf33b0ca Merge "Fix build on mac." 2014-12-10 00:16:20 +00:00
leozwang
298b6c70a0 Fix build on mac.
On mac require a case.
Also, this code is not portable, will fix it in long run.

(cherry-pick of 0f1fda9ee80ba086e4c8960a7d153798e3cf3285.)

Change-Id: I76194b62cea29bd3d21c7ba6c3da4d549bea4738
2014-12-09 16:12:51 -08:00
Elliott Hughes
173310a27c Merge "Add more debug information." 2014-12-10 00:10:05 +00:00
leozwang
cbf0267f5b Add more debug information.
Re-commit https://googleplex-android-review.googlesource.com/#/c/519430/
Add fix for win_sdk build.

Add socketpair debug log.
Also output thread information in log on host side.

(cherry-pick of adb09fa01a16d8c5c92c2f8d325e1678c531223f.)

Change-Id: I21021bc111a3f7362a91b70593e3738125878118
2014-12-09 16:08:24 -08:00
Elliott Hughes
3e16e2d619 Merge "Fix adb/fastboot windows compilations." 2014-12-10 00:06:31 +00:00
Christopher Ferris
67a7a4ae27 Fix adb/fastboot windows compilations.
Many of the windows files where not including stdlib.h even though they
are using malloc/free calls.

(cherry-pick of ae7bf0959bd3f79afbf365e41f015ed1c304afdc.)

Change-Id: If6959df9909d9d9928e9f4a2a96018166361cf3c
2014-12-09 16:03:29 -08:00
Elliott Hughes
02ef15f1d7 Merge "Introduce "adb keygen"" 2014-12-10 00:01:06 +00:00
dcashman
3f7608276b Merge "Move property_context label handling to libselinux." 2014-12-09 17:27:57 +00:00
Elliott Hughes
ab0d542506 Merge "fastboot: Support USB 3.x SuperSpeed devices on Linux" 2014-12-08 23:04:58 +00:00
Elliott Hughes
dbb7c46d68 Merge "ADB on linux: Handle USB SuperSpeed extra Descriptors" 2014-12-08 22:35:41 +00:00
Nick Kralevich
bea3f9c345 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-12-08 13:44:39 -08:00
Elliott Hughes
a5e9b065ef Merge "adb: enable superspeed support" 2014-12-08 19:23:30 +00:00
Elliott Hughes
5124839562 Merge "Clean up adb/Android.mk" 2014-12-08 18:02:30 +00:00