Riley Andrews
53432b46fa
Merge "fix memory leak in copy_remote_dir_local"
2014-12-12 22:05:31 +00:00
Riley Andrews
4d04d24b9e
fix memory leak in copy_remote_dir_local
...
Bug https://code.google.com/p/android/issues/detail?id=82436
Change-Id: I4bfa865638742e1b7cedd17f5b33dcc10c7f711c
2014-12-12 22:03:14 +00:00
Elliott Hughes
1f5cad5b8b
Merge "Cleanup libsparse Android.mk"
2014-12-12 19:37:47 +00:00
Elliott Hughes
0ccde5f978
Merge "Cleanup fastbootd Android.mk"
2014-12-12 19:33:59 +00:00
Elliott Hughes
48a941cee4
Merge "Cleanup libbacktrace Android.mk"
2014-12-12 19:16:15 +00:00
Trevor Drake
5f0c32c738
Cleanup fastbootd Android.mk
...
Removed unnecessary LOCAL_C_INCLUDES for non existent include directory
and also for dependencies that now use LOCAL_EXPORT_C_INCLUDE_DIRS
( libcrypto_static, libmdnssd libz )
Change-Id: I8d1ff6a0a8528c33c38a394497125385dc643e2b
2014-12-12 10:14:22 +00:00
Trevor Drake
5e4d0a5ec8
Cleanup libbacktrace Android.mk
...
Removed unnecessary libbacktrace_c_includes variable
Change-Id: I2ef29dc9810f7d9a7dcf5c232e9e85d2fc2fd5e8
2014-12-12 04:40:06 +00:00
Trevor Drake
a840300bab
Cleanup libsparse Android.mk
...
Removed unnecessary external/zlib reference from LOCAL_C_INCLUDES
Change-Id: Ib61da00dc1e0eac89a68f244881b12e2a4e92e64
2014-12-12 04:19:27 +00:00
Elliott Hughes
ffe4d9cdc7
Merge "toybox has md5sum, so lose toolbox's md5."
2014-12-12 03:07:54 +00:00
Elliott Hughes
014ab468f3
toybox has md5sum, so lose toolbox's md5.
...
We've now removed enough that for the first time toolbox has
dipped below toybox in size:
-rwxr-xr-x root shell 230800 2014-12-11 18:55 toolbox
-rwxr-xr-x root shell 233632 2014-12-11 18:32 toybox
Change-Id: I6b150f195dd9f803ddce58a89aa7c23a5b930e5b
2014-12-11 18:56:38 -08:00
Dan Albert
da4f30c5b4
Merge "Remove incompatible Unicode compatibility types."
2014-12-12 02:42:30 +00:00
Elliott Hughes
efd482f5e4
Merge "Lose mknod to toybox."
2014-12-12 02:38:39 +00:00
Elliott Hughes
71cf21fe1f
Lose mknod to toybox.
...
Change-Id: Ib81efed6c06a776626a42c25508b15461e495288
2014-12-11 18:33:46 -08:00
Yabin Cui
d1090ea028
Merge "Make crasher smash-stack work."
2014-12-12 02:09:34 +00:00
Yabin Cui
2331b95609
Make crasher smash-stack work.
...
Bug: 18721888
Change-Id: Id0280df7cb2c29832256d3d395e6399fcef9aa2b
2014-12-11 17:49:12 -08:00
Elliott Hughes
fc383879eb
Merge "Remove toolbox hd."
2014-12-12 00:29:04 +00:00
Elliott Hughes
c6251d8f46
Remove toolbox hd.
...
No one runs this anyway; they get the slightly better one from mksh instead.
Change-Id: I5e629cb3b443d3d38206f11f365fe483936d5440
2014-12-11 16:20:02 -08:00
Chih-Hung Hsieh
8386e134be
Merge "Fix clang compiler warning."
2014-12-11 21:59:09 +00:00
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