Commit graph

1824 commits

Author SHA1 Message Date
David Zeuthen
8f9a1575aa Add slot_suffix field to struct bootloader_message.
am: 846c094fee

* commit '846c094fee9e50ed2b2e63dee17f5bafb2b9d1ce':
  Add slot_suffix field to struct bootloader_message.
2015-11-19 23:00:30 +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  -s ours

* commit '818fa781d1dbe35c0c5bfff3ebff1b45a2a676f0':
  DO NOT MERGE recovery: Switch applypatch/ and updater/ to cpp.
2015-11-19 22:53:47 +00:00
Sami Tolvanen
81faa274d0 Add error and range checks to parse_range
am: 806f72f9e6  -s ours

* commit '806f72f9e6ec0d15b550b79b0baa92a93fc646e3':
  Add error and range checks to parse_range
2015-11-19 22:47:41 +00:00
Dan Albert
34a265cbac Stop using libstdc++.
am: 56deefba73  -s ours

* commit '56deefba73fb318ba0498da49adc64de960a6e29':
  Stop using libstdc++.
2015-11-19 22:42:24 +00:00
Tao Bao
29cc06e50c recovery: Switch to clang
am: 7101b2e285  -s ours

* commit '7101b2e2854985727b7ef65e5b5057e0ecf2d034':
  recovery: Switch to clang
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
Elliott Hughes
5c6912148b Merge "We can use fclose directly in std::unique_ptr." 2015-11-13 16:27:55 +00: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
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
4ea2b0c4ac Merge "recovery: Depend on mkfs.f2fs only if needed."
am: a412198699

* commit 'a4121986990d7dde7918252a96d87e4c3c11c13c':
  recovery: Depend on mkfs.f2fs only if needed.
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
cc9dd3d524 Merge "updater: Bump up the BBOTA version to 4."
am: f204185f71

* commit 'f204185f7138687769f95c28fe22fa88143bc004':
  updater: Bump up the BBOTA version to 4.
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

Change-Id: I4dd44417d07dd0a31729894628635a0aa1659008
2015-10-22 17:04:28 -07: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
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
6eb2668de1 am aa59a989: am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread."
* commit 'aa59a9898824c39cad3f1a1dde5fc4c8ceeabb40':
  minadbd: use strdup() to create argument for sideload thread.
2015-09-30 20:16:54 +00:00
Yabin Cui
aa59a98988 am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread."
* commit '4b66a280d314ab5aeb5027fe5b0023ae1f25ecca':
  minadbd: use strdup() to create argument for sideload thread.
2015-09-30 20:10:51 +00:00
Yabin Cui
4b66a280d3 Merge "minadbd: use strdup() to create argument for sideload thread." 2015-09-30 17:43:59 +00:00
Yabin Cui
c8a3c80603 minadbd: use strdup() to create argument for sideload thread.
So sideload thread will not use argument which is to be freed
in the main thread.

Bug: 23968770
Change-Id: I9d6dadc6c33cfbe4b5759382a80fe14cd0d54355
2015-09-29 18:09:34 -07:00
Tao Bao
6a47dffde5 updater: Skip empty lines in the transfer list file.
We have the last line being empty as a result of
android::base::Split("a\nb\n"), which leads to "missing command"
warnings in the update. Just skip all the empty lines.

Bug: 24373789
Change-Id: I5827e4600bd5cf0418d95477e4592fec47bbd3a9
2015-09-25 17:12:28 -07:00
Tao Bao
d715674899 am f61eec3e: am 2bdac629: Merge changes Ic769eafc,I63f28b3b
* commit 'f61eec3e2db4e0e9bfa37cff23e5e05c92384e83':
  updater: Use android::base::ParseInt() to parse integers.
  Suppress some compiler warnings due to signedness.
2015-09-25 18:39:26 +00:00
Tao Bao
f61eec3e2d am 2bdac629: Merge changes Ic769eafc,I63f28b3b
* commit '2bdac629f1d109dc79370edec8a31e20fbbe384c':
  updater: Use android::base::ParseInt() to parse integers.
  Suppress some compiler warnings due to signedness.
2015-09-25 18:32:55 +00:00
Tao Bao
2bdac629f1 Merge changes Ic769eafc,I63f28b3b
* changes:
  updater: Use android::base::ParseInt() to parse integers.
  Suppress some compiler warnings due to signedness.
2015-09-25 18:28:10 +00:00
Tao Bao
b15fd224ed updater: Use android::base::ParseInt() to parse integers.
Change-Id: Ic769eafc8d9535b1d517d3dcbd398c3fd65cddd9
2015-09-24 12:14:37 -07:00
Tao Bao
5701d5829d Suppress some compiler warnings due to signedness.
Change-Id: I63f28b3b4ba4185c23b972fc8f93517295b1672a
2015-09-24 11:06:58 -07:00
Yabin Cui
7c7d876d15 am f7319f4d: am 3317d501: Merge "minadbd: move from D() to VLOG()."
* commit 'f7319f4dbd04f72a53f5ad313794ade240530406':
  minadbd: move from D() to VLOG().
2015-09-23 23:20:55 +00:00
Yabin Cui
f7319f4dbd am 3317d501: Merge "minadbd: move from D() to VLOG()."
* commit '3317d5017963684cdbf4573d6cc6c0ff4cee0869':
  minadbd: move from D() to VLOG().
2015-09-23 23:11:11 +00:00
Yabin Cui
3317d50179 Merge "minadbd: move from D() to VLOG()." 2015-09-23 23:05:32 +00:00
Yabin Cui
7c913e5faa minadbd: move from D() to VLOG().
Change-Id: I542e2ae8f5ef18b2d6b3dbc1888b3ce1e02a7404
2015-09-23 16:04:41 -07:00