Dan Albert
977b84140f
am da4f30c5
: Merge "Remove incompatible Unicode compatibility types."
...
* commit 'da4f30c5b451091068ecb5f6fa3697a7dd6bb7df':
Remove incompatible Unicode compatibility types.
2014-12-12 02:53:25 +00:00
Elliott Hughes
3e49bbc4c1
am efd482f5
: Merge "Lose mknod to toybox."
...
* commit 'efd482f5e41aaca30521f2cb20e4dcad731cc9f8':
Lose mknod to toybox.
2014-12-12 02:53:23 +00: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
e1d5ce1c23
am d1090ea0
: Merge "Make crasher smash-stack work."
...
* commit 'd1090ea0287e980e286d7622093564fdb0e00b0e':
Make crasher smash-stack work.
2014-12-12 02:21:40 +00: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
4f5fddea23
am fc383879
: Merge "Remove toolbox hd."
...
* commit 'fc383879eb8a6ee940f56128d33ec9e59924d9ba':
Remove toolbox hd.
2014-12-12 00:40:31 +00: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
9449bd618d
am 8386e134
: Merge "Fix clang compiler warning."
...
* commit '8386e134be39e94f2856ed317d86172ea51edd3c':
Fix clang compiler warning.
2014-12-11 22:40:18 +00:00
Chih-Hung Hsieh
8386e134be
Merge "Fix clang compiler warning."
2014-12-11 21:59:09 +00:00
Elliott Hughes
8313dddcb9
am 81784ae8
: Merge "Lose chmod to toybox."
...
* commit '81784ae8ddae139646441eb1dcaa5e1d89ab29de':
Lose chmod to toybox.
2014-12-11 21:07:37 +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
d3653c90cd
am 3570072c
: Merge "Use full qualified name in macros."
...
* commit '3570072c362fc379ac83bcae6d9ff43db06ffcfb':
Use full qualified name in macros.
2014-12-11 19:54:27 +00: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
6984e6dc97
am de180fc2
: Merge "Remove unused local variable."
...
* commit 'de180fc2834a3e42b6383027cf47b561e861108e':
Remove unused local variable.
2014-12-10 22:35:40 +00:00
Eric Laurent
4108bccbe8
am 4fca5918
: audio: add usage "virtual source" to audio attributes.
...
* commit '4fca59181c838b91572d1b57cb74b26d0a70528f':
audio: add usage "virtual source" to audio attributes.
2014-12-10 22:20:09 +00: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
f6a9309b94
am 250d1d1b
: Merge "Move property_context label handling to libselinux."
...
* commit '250d1d1bf3cd462065a456369c11a3ce8fbe531f':
Move property_context label handling to libselinux.
2014-12-10 22:07:12 +00: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
4110da7522
am 765f371c
: Merge "Print ASCII near register for all archs"
...
* commit '765f371cf40c67ccca3033b05aa052de0145f999':
Print ASCII near register for all archs
2014-12-10 19:11:15 +00:00
Marco Nelissen
e8be3ad9d1
am 5eb43118
: Merge "Allow updates for open file descriptors"
...
* commit '5eb431180bcc0fb153d2c821c6735aadcda02ae5':
Allow updates for open file descriptors
2014-12-10 19:03:42 +00: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
0d43d918b0
am 65c06de7
: Merge "kill libunz"
...
* commit '65c06de7629103234bd56392db1a99ee0ab6cb79':
kill libunz
2014-12-10 18:19:32 +00: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
9ccf0cbaf1
am a97c1075
: Merge "Fix Nick\'s nits"
...
* commit 'a97c10755442e3800c0b1011d986d554ce2096db':
Fix Nick's nits
2014-12-10 03:48:42 +00:00
Elliott Hughes
603c7d0d95
am 294e610f
: Merge "Fix verity on system partitions larger than 2G"
...
* commit '294e610f886eeb839d16172bb5b98559a6a7434d':
Fix verity on system partitions larger than 2G
2014-12-10 03:48:41 +00: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
2f38122a0f
Remove dead file.
...
Change-Id: I70a37679a624f2ea2c2d6e1610ad8999c09e5262
2014-12-09 19:35:21 -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
Elliott Hughes
32e9163b2a
resolved conflicts for merge of b471f524
to lmp-mr1-dev-plus-aosp
...
Change-Id: I6efd0d4a0ece0b065d02796916355ad5ae8b4eea
2014-12-09 19:12:21 -08:00
Elliott Hughes
b1d67c1db1
am 7a497e3b
: Merge "adb warns on remount when verity is enabled"
...
* commit '7a497e3b5cc8aee61c5fa3e323d322f68a13c5b2':
adb warns on remount when verity is enabled
2014-12-10 02:32:02 +00:00
Elliott Hughes
822eee94c3
am e1fb0899
: Merge "fastbootd: Use FASTBOOT constants instead of ADB constants"
...
* commit 'e1fb0899452283255bb52950aefce24c36c95390':
fastbootd: Use FASTBOOT constants instead of ADB constants
2014-12-10 02:32:01 +00:00
Elliott Hughes
c162dbb2ff
am 83b4047b
: Merge "adbd & fastbootd: Support for new f_fs descriptor format"
...
* commit '83b4047bc66729f8cf854c525e2bc8bac7c9587e':
adbd & fastbootd: Support for new f_fs descriptor format
2014-12-10 02:32:00 +00:00
Elliott Hughes
c71562dd9d
am 1dbf33b0
: Merge "Fix build on mac."
...
* commit '1dbf33b0ca240d55fea477ecfb79052d9b006b89':
Fix build on mac.
2014-12-10 02:31:59 +00:00
Elliott Hughes
d86af4dc5d
am 173310a2
: Merge "Add more debug information."
...
* commit '173310a27c1b58034bf47e08e58942137583fea8':
Add more debug information.
2014-12-10 02:31:57 +00:00
Elliott Hughes
3094c26d1b
am 3e16e2d6
: Merge "Fix adb/fastboot windows compilations."
...
* commit '3e16e2d6195e112a2bfe2f958e1cfec2bd109a1c':
Fix adb/fastboot windows compilations.
2014-12-10 02:31:56 +00:00