Qiwen Zhao
a259540f59
Merge commit \'27604fcbee0010b800bfc16b5bf7a48c365c2cf3\' into mnc-dr2-dev-plus-aosp
...
am: 8b254cfc3c
2015-11-19 23:03:58 +00:00
David Zeuthen
8f9a1575aa
Add slot_suffix field to struct bootloader_message.
...
am: 846c094fee
2015-11-19 23:00:30 +00:00
Tao Bao
e8617cf83e
DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp. am: 818fa781d1 -s ours
...
am: f4848f63ad
2015-11-19 22:58:20 +00:00
Qiwen Zhao
a550e6b412
Merge commit '8f90389966fabf532b24741d49245215279533e1' into mnc-dr2-dev-plus-aosp
2015-11-19 14:56:59 -08:00
Qiwen Zhao
312f7c71f4
Merge commit '32ac97675bade3681203c46d001f76b11a359fd5' into mnc-dr2-dev-plus-aosp
2015-11-19 14:56:45 -08:00
Qiwen Zhao
681b3c9fd0
Merge commit 'f47259b18492c921445d9e437a9f9ed11c52fac6' into mnc-dr2-dev-plus-aosp
2015-11-19 14:56:28 -08:00
Qiwen Zhao
06ec3bab56
Merge commit '3b199267d6d4c279cbef3286a74e16bf92dd8d8a' into mnc-dr2-dev-plus-aosp
2015-11-19 14:56:14 -08:00
Qiwen Zhao
8b254cfc3c
Merge commit '27604fcbee0010b800bfc16b5bf7a48c365c2cf3' into mnc-dr2-dev-plus-aosp
2015-11-19 14:56:00 -08:00
Tao Bao
f4848f63ad
DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp.
...
am: 818fa781d1
2015-11-19 22:53:47 +00:00
Sami Tolvanen
d32cfe9286
Add error and range checks to parse_range am: 806f72f9e6 -s ours
...
am: 81faa274d0
2015-11-19 22:51:56 +00:00
Dan Albert
0ea84ea8e4
Stop using libstdc++. am: 56deefba73 -s ours
...
am: 34a265cbac
2015-11-19 22:51:52 +00:00
Sami Tolvanen
81faa274d0
Add error and range checks to parse_range
...
am: 806f72f9e6
2015-11-19 22:47:41 +00:00
Dan Albert
34a265cbac
Stop using libstdc++.
...
am: 56deefba73
2015-11-19 22:42:24 +00:00
Tao Bao
f4b871890b
recovery: Switch to clang am: 7101b2e285 -s ours
...
am: 29cc06e50c
2015-11-19 22:06:50 +00:00
Tao Bao
29cc06e50c
recovery: Switch to clang
...
am: 7101b2e285
2015-11-19 21:59:07 +00:00
David Zeuthen
846c094fee
Add slot_suffix field to struct bootloader_message.
...
This is needed by fs_mgr for certain A/B implementations.
Change-Id: I7bb404d61198eb7a962c2b693911f5156745daae
2015-11-16 14:28:40 -08:00
Tao Bao
8f90389966
recovery: Allow "Mount /system" for system_root_image.
...
When system images contain the root directory, there is no entry of
"/system" in the fstab. Change it to look for "/" instead if
ro.build.system_root_image is true. We actually mount the partition
to /system_root instead, and create a symlink to /system_root/system
for /system. This allows "adb shell" to work properly.
Bug: 22855115
Change-Id: I91864444950dc3229fda3cc133ddbadeb8817fb8
(cherry picked from commit abb8f7785e
2015-11-16 14:28:40 -08:00
Tao Bao
32ac97675b
applypatch: Fix the checking in WriteToPartition().
...
WriteToPartition() should consider a target name as valid if it contains
multiple colons. But only the first two fields will be used.
Bug: 22725128
Change-Id: I9d0236eaf97df9db9704acf53690d0ef85188e45
(cherry picked from commit 1ce7a2a63d
2015-11-16 14:28:40 -08:00
Tao Bao
f47259b184
applypatch: Support flash mode.
...
We may carry a full copy of recovery image in the /system, and use
/system/bin/install-recovery.sh to install the recovery. This CL adds
support to flash the recovery partition with the given image.
Bug: 22641135
Change-Id: I345eaaee269f6443527f45a9be7e4ee47f6b2b39
(cherry picked from commit 68c5a67967
2015-11-16 14:28:40 -08:00
Tao Bao
3b199267d6
updater: libapplypatch needs libbase now.
...
Change-Id: Ibe3173edd6274b61bd9ca5ec394d7f6b4a403639
(cherry picked from commit 1b1ea17d55
2015-11-16 14:28:40 -08:00
Tao Bao
27604fcbee
applypatch: Refactor strtok().
...
We have android::base::Split() for the work.
Change-Id: Ic529db42090f700e6455d465c8b84b7f52d34d63
(cherry picked from commit 0a47ce27de
2015-11-16 14:28:40 -08:00
Tao Bao
818fa781d1
DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp.
...
Mostly trivial changes to make cpp compiler happy.
Change-Id: I69bd1d96fcccf506007f6144faf37e11cfba1270
(cherry picked from commit ba9a42aa7e
2015-11-16 14:28:40 -08:00
Sami Tolvanen
806f72f9e6
Add error and range checks to parse_range
...
Only trusted input is passed to parse_range, but check for invalid
input to catch possible problems in transfer lists.
Bug: 21033983
Bug: 21034030
Bug: 21034172
Bug: 21034406
Change-Id: I1e266de3de15c99ee596ebdb034419fdfe7eba1f
(cherry picked from commit f2bac04e1b
2015-11-16 14:28:40 -08:00
Dan Albert
56deefba73
Stop using libstdc++.
...
These are already getting libc++, so it isn't necessary. If any of the
other static libraries (such as adb) use new or delete from libc++,
there will be symbol collisions.
Change-Id: I55e43ec60006d3c2403122fa1174bde06f18e09f
(cherry picked from commit e49a9e527a
2015-11-16 14:28:40 -08:00
Tao Bao
7101b2e285
recovery: Switch to clang
...
And a few trival fixes to suppress warnings.
Change-Id: Id28e3581aaca4bda59826afa80c0c1cdfb0442fc
(cherry picked from commit 80e46e08de
2015-11-16 14:28:40 -08:00
Paul Lawrence
fd1bfa2a41
Merge "Create convert_fbe breadcrumb file to support conversion to FBE"
2015-11-13 17:25:09 +00:00
Elliott Hughes
11c26abe2d
Merge "We can use fclose directly in std::unique_ptr."
...
am: 5c6912148b
2015-11-13 16:37:44 +00:00
Elliott Hughes
5c6912148b
Merge "We can use fclose directly in std::unique_ptr."
2015-11-13 16:27:55 +00:00
Paul Lawrence
d0db337d72
Create convert_fbe breadcrumb file to support conversion to FBE
...
Change-Id: I38b29e1e34ea793e4b87cd27a1d39fa905fddf7a
2015-11-13 07:49:31 -08:00
Elliott Hughes
63b089e3aa
We can use fclose directly in std::unique_ptr.
...
It turns out the standard explicitly states that if the pointer is
null, the deleter function won't be called. So it doesn't matter that
fclose(3) doesn't accept null.
Change-Id: I10e6e0d62209ec03ac60e673edd46f32ba279a04
2015-11-12 21:07:55 -08:00
Tao Bao
8b5f9d74a0
Merge "uncrypt: remove O_SYNC to avoid time-out failures"
...
am: e4a3da9f51
2015-11-05 18:07:57 +00:00
Tao Bao
e4a3da9f51
Merge "uncrypt: remove O_SYNC to avoid time-out failures"
2015-11-05 18:02:05 +00:00
Jaegeuk Kim
cc4e3c6002
uncrypt: remove O_SYNC to avoid time-out failures
...
This patch removes costly O_SYNC flag for encrypted block device.
After writing whole decrypted blocks, fsync should guarantee their consistency
from further power failures.
This patch reduces the elapsed time significantly consumed by upgrading packages
on an encrypted partition, so that it could avoid another time-out failures too.
Change-Id: I1fb9022c83ecc00bad09d107fc87a6a09babb0ec
Signed-off-by: Jaegeuk Kim <jaegeuk@motorola.com>
2015-11-04 11:43:58 -08:00
Tao Bao
c40d9afaa4
Merge "recovery: Depend on mkfs.f2fs only if needed." am: a412198699
...
am: 4ea2b0c4ac
2015-10-28 16:43:27 +00:00
Tao Bao
4ea2b0c4ac
Merge "recovery: Depend on mkfs.f2fs only if needed."
...
am: a412198699
2015-10-28 16:36:23 +00:00
Tao Bao
a412198699
Merge "recovery: Depend on mkfs.f2fs only if needed."
2015-10-28 16:32:50 +00:00
Tao Bao
f68351209f
recovery: Depend on mkfs.f2fs only if needed.
...
Don't build mkfs.f2fs unless device defines TARGET_USERIMAGES_USE_F2FS.
Change-Id: Ifac592c30315bbe7590c8fbf3a0844e6a7a31a1a
2015-10-27 22:00:35 -07:00
Tao Bao
03540bc978
Merge "updater: Bump up the BBOTA version to 4." am: f204185f71
...
am: cc9dd3d524
2015-10-23 18:55:13 +00:00
Tao Bao
cc9dd3d524
Merge "updater: Bump up the BBOTA version to 4."
...
am: f204185f71
2015-10-23 18:45:30 +00:00
Tao Bao
f204185f71
Merge "updater: Bump up the BBOTA version to 4."
2015-10-23 18:37:33 +00:00
Tao Bao
1fdec8685a
updater: Bump up the BBOTA version to 4.
...
To accommodate new changes in N release, such as error correction [1]
and other potential changes to the updater.
[1]: commit 0a7b47397d
2015-10-22 17:04:28 -07:00
Sami Tolvanen
a2fcae8130
am 339ec2ef: am 78615fa5: Merge "Error correction: Use libfec in blockimg.cpp for recovery"
...
* commit '339ec2ef02614f17823f9b00af8b35c1f8ee734c':
Error correction: Use libfec in blockimg.cpp for recovery
2015-10-19 17:14:01 +00:00
Sami Tolvanen
339ec2ef02
am 78615fa5: Merge "Error correction: Use libfec in blockimg.cpp for recovery"
...
* commit '78615fa50bb10318035d31bccdf502913e1041b7':
Error correction: Use libfec in blockimg.cpp for recovery
2015-10-19 10:06:42 -07:00
Sami Tolvanen
78615fa50b
Merge "Error correction: Use libfec in blockimg.cpp for recovery"
2015-10-19 17:03:04 +00:00
Sami Tolvanen
0a7b47397d
Error correction: Use libfec in blockimg.cpp for recovery
...
Add block_image_recover function to rewrite corrupted blocks on the
partition. This can be attempted if block_image_verify fails.
Note that we cannot use libfec during block_image_update as it may
overwrite blocks required for error correction. A separate recovery
pass in case the image is corrupted is the only viable option.
Bug: 21893453
Change-Id: I6ff25648fff68d5f50b41a601c95c509d1cc5bce
2015-10-19 10:04:38 +01:00
Tao Bao
e228541fca
am 4c6c96a5: am 245b2da1: am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file."
...
* commit '4c6c96a59566e8e876cc803be84c16d3f04f31d4':
updater: Skip empty lines in the transfer list file.
2015-10-01 00:05:23 +00:00
Tao Bao
4c6c96a595
am 245b2da1: am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file."
...
* commit '245b2da1711db8a9b8e333395d68235df5163483':
updater: Skip empty lines in the transfer list file.
2015-09-30 23:59:57 +00:00
Tao Bao
245b2da171
am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file."
...
* commit '754ebaa90a3e11012e2456013e69b34a30272c4a':
updater: Skip empty lines in the transfer list file.
2015-09-30 23:44:35 +00:00
Tao Bao
754ebaa90a
Merge "updater: Skip empty lines in the transfer list file."
2015-09-30 23:29:11 +00:00
Yabin Cui
089f41b514
am 6eb2668d: am aa59a989: am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread."
...
* commit '6eb2668de1afca57b7c64532f98f84b7fcec1f60':
minadbd: use strdup() to create argument for sideload thread.
2015-09-30 20:24:23 +00:00
