Commit Graph

4602 Commits

Author SHA1 Message Date
Tao Bao d8a4e9e8fa Merge "recovery: Use libverifier instead of rebuilding the sources." am: c008485643 am: 1dc25e3e0a am: 1f7e8f6ab6
am: bf8e46b45a

Change-Id: I31ae9610f713ab26dc5f648d8ff9ffbb406aad59
2017-05-09 17:36:20 +00:00
Tao Bao bf8e46b45a Merge "recovery: Use libverifier instead of rebuilding the sources." am: c008485643 am: 1dc25e3e0a
am: 1f7e8f6ab6

Change-Id: Ifb27bb442d7bfe0cec59e7de8c66402a9e5fde93
2017-05-09 17:00:02 +00:00
Tao Bao 1f7e8f6ab6 Merge "recovery: Use libverifier instead of rebuilding the sources." am: c008485643
am: 1dc25e3e0a

Change-Id: Ib8930473e5ad198915a0a6cb6b2b2119ec4b54ac
2017-05-09 16:58:33 +00:00
Tao Bao 1dc25e3e0a Merge "recovery: Use libverifier instead of rebuilding the sources."
am: c008485643

Change-Id: Ie75f03351f2106fc816a133c52365444064ce608
2017-05-09 16:56:32 +00:00
Tao Bao c008485643 Merge "recovery: Use libverifier instead of rebuilding the sources." 2017-05-09 16:49:31 +00:00
Tao Bao 4deb2fb1bd Merge "Add a binary path param to update_binary_command()." am: 197304aada am: f648b5c9fc am: f49c57643d
am: 460e47adfc

Change-Id: I34b789b29f019f730d6c8a7e3a96384a056c1d4a
2017-05-09 00:28:00 +00:00
Tao Bao 460e47adfc Merge "Add a binary path param to update_binary_command()." am: 197304aada am: f648b5c9fc
am: f49c57643d

Change-Id: Iea3496ad9cbcd8389ade9effa7072198cf33a5c3
2017-05-09 00:22:30 +00:00
Tao Bao f49c57643d Merge "Add a binary path param to update_binary_command()." am: 197304aada
am: f648b5c9fc

Change-Id: I5210a1f710ea95e36484e6f2ea85354baa95c416
2017-05-09 00:20:30 +00:00
Tao Bao f648b5c9fc Merge "Add a binary path param to update_binary_command()."
am: 197304aada

Change-Id: I7035cbc02b8f7dcd9a7b41602105e9397ab35572
2017-05-09 00:17:59 +00:00
Tao Bao 197304aada Merge "Add a binary path param to update_binary_command()." 2017-05-09 00:13:55 +00:00
Tao Bao 00d5757186 Add a binary path param to update_binary_command().
This allows writing native tests for non-A/B update_binary_command().
Prior to this CL, it was extracting the updater to a hard-coded
location (/tmp/update_binary) that's not available under the test
environment.

Test: recovery_component_test on angler and marlin respectively.
Test: Sideload OTA packages on angler and marlin respectively.
Change-Id: I78b9cc211d90c0a16a84e94e339b65759300e2a8
2017-05-08 12:16:45 -07:00
Tao Bao b168f5f857 recovery: Use libverifier instead of rebuilding the sources.
Test: mmma bootable/recovery
Change-Id: Ie8cec009b00c121948179518ba9cbc26a82352bf
2017-05-08 11:04:07 -07:00
Jin Qian 8378187a17 Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abca am: d6f506e783 am: 5975ee6a46
am: fce0589895

Change-Id: I15fc61221441c2c8e3d440ae2cc8e423f027c802
2017-05-05 20:01:37 +00:00
Jin Qian fce0589895 Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abca am: d6f506e783
am: 5975ee6a46

Change-Id: I607d33c4309613d91a2088ddc4fc2950df7827c9
2017-05-05 19:55:36 +00:00
Jin Qian 5975ee6a46 Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" am: f347c1abca
am: d6f506e783

Change-Id: I3f07419c0ccb380770220b201981b0fc7c88cc8f
2017-05-05 19:53:36 +00:00
Jin Qian d6f506e783 Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0"
am: f347c1abca

Change-Id: I0308f26d79af2f34a28a0c67142b8e205bf07062
2017-05-05 19:51:36 +00:00
Treehugger Robot f347c1abca Merge "recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0" 2017-05-05 19:39:25 +00:00
Jin Qian adeb41a8c0 recovery: update mkfs.f2fs args to match f2fs-tools 1.8.0
mkfs.f2fs in 1.8.0 returns error if number of sectors is 0. Skip
this argument to let mkfs detect device size. 0 sector is also not
necessary for 1.4.1.

Test: format userdata to f2fs and boot
Bug: 37758867
Change-Id: If120988dfb678596c973d183572f870eb0b72a27
2017-05-05 11:07:46 -07:00
Tianjie Xu 1c503a2fb1 Merge "Update the comment for obsolete symlink handling ." am: a24f9d7cc7 am: e452c25620 am: 4ab07dfcd3
am: f7f1188ab6

Change-Id: If15421c189a59794fd3b78fac8a2dca012fceb0f
2017-05-04 01:37:15 +00:00
Tianjie Xu f7f1188ab6 Merge "Update the comment for obsolete symlink handling ." am: a24f9d7cc7 am: e452c25620
am: 4ab07dfcd3

Change-Id: I0431bb7c57bcb11a7618ccde40a7f71e2eba7baa
2017-05-04 01:34:44 +00:00
Tianjie Xu 4ab07dfcd3 Merge "Update the comment for obsolete symlink handling ." am: a24f9d7cc7
am: e452c25620

Change-Id: Ifc3a1b4921c1bea13a232a03514ab715a19f300a
2017-05-04 01:32:14 +00:00
Tianjie Xu e452c25620 Merge "Update the comment for obsolete symlink handling ."
am: a24f9d7cc7

Change-Id: Ieb37d12ed5e0b164d067fd62e8daf7d8776fa31f
2017-05-04 01:29:14 +00:00
Treehugger Robot a24f9d7cc7 Merge "Update the comment for obsolete symlink handling ." 2017-05-04 01:22:26 +00:00
Tao Bao 7f6bf5053f Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c42198581 am: 1d33e0815d am: a51e44cef7
am: 38577ef1e1

Change-Id: I55260d77ab0dd2b5eff5010d65305b14111439b0
2017-05-04 01:00:14 +00:00
Tao Bao 38577ef1e1 Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c42198581 am: 1d33e0815d
am: a51e44cef7

Change-Id: I38990e888541ba2f6428277eae65c3d840364b60
2017-05-04 00:49:41 +00:00
Tao Bao a51e44cef7 Merge "Revert "Remove EXPAND/STRINGIFY macros."" am: 7c42198581
am: 1d33e0815d

Change-Id: I93c7c3e0d66c4e7d59b1d97552036026cb15f96a
2017-05-04 00:46:41 +00:00
Tao Bao 1d33e0815d Merge "Revert "Remove EXPAND/STRINGIFY macros.""
am: 7c42198581

Change-Id: I89eb2acace8e53a2af00fd681e6298edc157f8ac
2017-05-04 00:44:10 +00:00
Tao Bao 7c42198581 Merge "Revert "Remove EXPAND/STRINGIFY macros."" 2017-05-04 00:32:53 +00:00
Tao Bao 8be0f39fec Revert "Remove EXPAND/STRINGIFY macros."
This reverts commit ec9706738f.

Reason for revert: It's not a good idea to put RECOVERY_API_VERSION in
common.h, which might be included by device-specific codes (but with
RECOVERY_API_VERSION undefined).

Change-Id: I9feb9c64a5af3e9165164622a59b043aa28a8b8c
2017-05-04 00:31:11 +00:00
Tao Bao ab1e70647f Merge "fuse_sideload: Change the minimal block size to 4096." am: 4e8e56eaea am: 53b98de866 am: 6bea344d7e
am: bfca876038

Change-Id: I5d1fa644a867b523553127c8bde92000f4cb539a
2017-05-04 00:11:51 +00:00
Tao Bao bfca876038 Merge "fuse_sideload: Change the minimal block size to 4096." am: 4e8e56eaea am: 53b98de866
am: 6bea344d7e

Change-Id: If7e905a7630ee8cf142752695272afb8e76c28cb
2017-05-04 00:06:38 +00:00
Tao Bao 6bea344d7e Merge "fuse_sideload: Change the minimal block size to 4096." am: 4e8e56eaea
am: 53b98de866

Change-Id: Id70ff412dcc22ef36fd9cdd0540211ce49cb2437
2017-05-04 00:04:08 +00:00
Tao Bao 53b98de866 Merge "fuse_sideload: Change the minimal block size to 4096."
am: 4e8e56eaea

Change-Id: Ica6e3890e6f13ef57d7da340bfa0314b3f121b49
2017-05-04 00:01:37 +00:00
Tao Bao 2141470b23 Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7 am: 3642b99073 am: 5f8d2932d0
am: dd08a0d4d3

Change-Id: I266ad9ef96c483ed03fa4c385f05d0a658da9cee
2017-05-03 23:54:07 +00:00
Tao Bao 4e8e56eaea Merge "fuse_sideload: Change the minimal block size to 4096." 2017-05-03 23:52:34 +00:00
Tao Bao dd08a0d4d3 Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7 am: 3642b99073
am: 5f8d2932d0

Change-Id: Ib13d560262af5b9dbe762a7d7b01831b4791ba2f
2017-05-03 23:48:37 +00:00
Tao Bao 5f8d2932d0 Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7
am: 3642b99073

Change-Id: I28a2be565c74a051c8b5e7a5633455eb86483a3d
2017-05-03 23:46:37 +00:00
Tao Bao 3642b99073 Merge "Remove EXPAND/STRINGIFY macros."
am: b00c66faf7

Change-Id: I59a8424b2df0a8e02999061a80b9ecefd8aa23db
2017-05-03 23:43:37 +00:00
Tao Bao b00c66faf7 Merge "Remove EXPAND/STRINGIFY macros." 2017-05-03 23:38:32 +00:00
Tianjie Xu f38401a27c Update the comment for obsolete symlink handling .
Symlink is a filebased OTA feature, and the corresponding updater
function has been removed in
https://android-review.googlesource.com/#/c/350357/.

Also the only place where we call "package_extract_dir()" is to unpack
some bootloader dir in vendor's code. We plan to remove it also in a
separate bug.

Bug: 31917448
Test: mma
Change-Id: I3986d60958e64e0d5d8fa5f5bd508c579fb7fa2c
2017-05-03 23:34:42 +00:00
Tao Bao ec9706738f Remove EXPAND/STRINGIFY macros.
They are error-prone by putting anything into a string (e.g.
EXPAND(RECOVERY_API_VERSION) would become "RECOVER_API_VERSION" if we
forgot to pass -DRECOVERY_API_VERSION=3).

RECOVERY_API_VERSION is the only user (in bootable/recovery) that gets
stringified. Assign it to a typed var and sanity check the value.

Don't see other reference to the macros from device-specific recovery
directories (they can still define that locally if really needed).

Test: recovery_component_test
Test: Sideload an OTA on angler and marlin respectively.
Change-Id: I358bbdf8f0a99db5ce4c7bc2fdcafe8013501b64
2017-05-03 11:26:00 -07:00
Tianjie Xu 445d25d076 Merge "Add a default error code when updater script aborts" am: 89394632b1 am: 18bb9a4f26 am: 7a1c2943ab
am: 03f740ec3d

Change-Id: I3927cb4801a5b06467120a5e8c1c112438f86235
2017-05-03 17:51:41 +00:00
Tianjie Xu 03f740ec3d Merge "Add a default error code when updater script aborts" am: 89394632b1 am: 18bb9a4f26
am: 7a1c2943ab

Change-Id: I56207a2e987ee09e05270b0249b5f579f1710d11
2017-05-03 17:46:12 +00:00
Tianjie Xu 7a1c2943ab Merge "Add a default error code when updater script aborts" am: 89394632b1
am: 18bb9a4f26

Change-Id: I0614c33388d68a45d443de8058c2ee36e896c583
2017-05-03 17:43:41 +00:00
Tianjie Xu 18bb9a4f26 Merge "Add a default error code when updater script aborts"
am: 89394632b1

Change-Id: Iceebf87fb62b1c2a23e20c2b4966606c0c7b0a72
2017-05-03 17:40:41 +00:00
Tianjie Xu 89394632b1 Merge "Add a default error code when updater script aborts" 2017-05-03 17:34:45 +00:00
Tianjie Xu e0c88793d1 Add a default error code when updater script aborts
We didn't report error/cause codes unless there's an explict "Abort()"
call inside the updater script. As a result, some cause codes set by
ErrorAbort() didn't show up in last_install.

To fix the issue, add a default error code when the script terminates
abnormally (i.e. with non zero status).

Bug: 37912405
Test: error/cause code shows up in last_install when argument parsing fails
Change-Id: Ic6d3bd1855b853aeaa0760071e593a00cf6f0209
2017-05-03 05:52:03 +00:00
Tao Bao a616f0d476 Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c am: 08d9ede8f2 am: b3eeb817ab
am: 586377d1f3

Change-Id: I4d2cac061fbf6ac34e9e5125ebd5294dbc33e4ef
2017-05-02 23:54:02 +00:00
Tao Bao 586377d1f3 Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c am: 08d9ede8f2
am: b3eeb817ab

Change-Id: I1bcf86cbbc495bf5df92dc53e01be39e7c623255
2017-05-02 23:51:32 +00:00
Tao Bao b3eeb817ab Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c
am: 08d9ede8f2

Change-Id: I48024bef3d747e7f7913e5f76043ea74972ba135
2017-05-02 23:49:33 +00:00