Paul Crowley
dbaecf9804
[automerger skipped] Wipe the metadata partition when we wipe data. am: 723056a83f -s ours
...
am: 3e170e9afe -s ours
Change-Id: I3ce681b26c6af09a5330311432123496a614b6bb
2018-04-25 11:47:31 -07:00
android-build-prod (mdb)
b764a069e2
Merge "updater: Remove an unneeded strdup()." am: ab3c24bd51 am: 76f0edc05e
...
am: beeef60446
Change-Id: I0e8097aa80adf41c6e62279b6430bd58ef85a1d9
2018-04-25 11:44:06 -07:00
Paul Crowley
3e170e9afe
[automerger skipped] Wipe the metadata partition when we wipe data.
...
am: 723056a83f -s ours
Change-Id: I1f4aedc483aa2a0d1813f62870b9462dd58095ca
2018-04-25 11:39:11 -07:00
android-build-prod (mdb)
beeef60446
Merge "updater: Remove an unneeded strdup()." am: ab3c24bd51
...
am: 76f0edc05e
Change-Id: I0836af0b9ba9485c1908303b496fb86899aa4f43
2018-04-25 11:09:02 -07:00
android-build-prod (mdb)
76f0edc05e
Merge "updater: Remove an unneeded strdup()."
...
am: ab3c24bd51
Change-Id: I9a5b88f8091a208bc62678711f4ca0564d49538d
2018-04-25 11:06:01 -07:00
android-build-prod (mdb)
ab3c24bd51
Merge "updater: Remove an unneeded strdup()."
2018-04-25 17:57:12 +00:00
Paul Crowley
723056a83f
Wipe the metadata partition when we wipe data.
...
Bug: 78469201
Test: Wipe from recovery menu, check that wipe is logged correctly
and boot works as expected.
Merged-In: I5bc8ef1b83d78de8b5edba6cc17882edcc744356
Change-Id: I5bc8ef1b83d78de8b5edba6cc17882edcc744356
2018-04-25 09:31:04 -07:00
Tao Bao
188f3a5bf8
updater: Remove an unneeded strdup().
...
StringValue() makes a copy of the arg.
Test: mmma bootable/recovery
Change-Id: I1002994e7496c840aa05c785019bdeca281f467e
2018-04-25 07:16:00 -07:00
Paul Crowley
486dc73135
Merge "Wipe the metadata partition when we wipe data." am: 897385bfe2 am: 62fd21b9bb
...
am: bd56ab163a
Change-Id: I76d9b121644deb382dca26906e98768f982b31d6
2018-04-24 20:03:05 -07:00
Paul Crowley
bd56ab163a
Merge "Wipe the metadata partition when we wipe data." am: 897385bfe2
...
am: 62fd21b9bb
Change-Id: I338d7882e63abe9e78c2566b32c0fe28e2272614
2018-04-24 19:54:43 -07:00
Paul Crowley
62fd21b9bb
Merge "Wipe the metadata partition when we wipe data."
...
am: 897385bfe2
Change-Id: I29a83ac2792e5564f83ea7dac13740f5a6052bd0
2018-04-24 19:48:41 -07:00
Treehugger Robot
897385bfe2
Merge "Wipe the metadata partition when we wipe data."
2018-04-25 02:38:11 +00:00
Paul Crowley
3b4d516151
Wipe the metadata partition when we wipe data.
...
Bug: 78469201
Test: Wipe from recovery menu, check that wipe is logged correctly
and boot works as expected.
Change-Id: I5bc8ef1b83d78de8b5edba6cc17882edcc744356
2018-04-24 17:08:22 -07:00
Tianjie Xu
482d722f5b
Merge "Dump debug information for apply_patch unit tests" am: fe527cced4 am: 943c2057ad
...
am: 4388c79242
Change-Id: I99fc80d1679752dbc4c97df5f18d08b635fe256f
2018-04-24 11:47:38 -07:00
Tianjie Xu
4388c79242
Merge "Dump debug information for apply_patch unit tests" am: fe527cced4
...
am: 943c2057ad
Change-Id: If76814a3e45b6f199f2cfe5d8da7a176d37a573f
2018-04-24 11:42:37 -07:00
Tianjie Xu
943c2057ad
Merge "Dump debug information for apply_patch unit tests"
...
am: fe527cced4
Change-Id: Ife392c1a6a99e8ae0b8d4a46330596f5c742f099
2018-04-24 11:39:05 -07:00
Tianjie Xu
fe527cced4
Merge "Dump debug information for apply_patch unit tests"
2018-04-24 18:30:29 +00:00
Tianjie Xu
ffed57a7a3
Dump debug information for apply_patch unit tests
...
The apply patch test should have a deterministic way to append patch
data. Add debug logs to dump the length and SHA1 of each step to further
track down the flakiness.
Also redirect the debug logging to stdout in case the logcat becomes too
chatty.
Bug: 67849209
Test: Run recovery_component_test
Change-Id: I42bafef2d9dee599719ae57840b3d8c00d243ebd
2018-04-24 09:56:55 -07:00
Tao Bao
766a410388
Merge "update_verifier: Move to Soong." am: ed022fccdf am: 9bc286dd71
...
am: 8206907cf0
Change-Id: Ifb0dc46083ff59eb7d841974ed95d370e6ac9a56
2018-04-23 16:08:01 -07:00
Tao Bao
3113958889
Merge "Make update_verifier generic across verified boot versions." am: ea63f59469 am: abcac8e1e7
...
am: 98de595c59
Change-Id: I1cb26ccef5a1ec911f2edfb33520c8f1d54f3c01
2018-04-23 15:59:51 -07:00
Tao Bao
8206907cf0
Merge "update_verifier: Move to Soong." am: ed022fccdf
...
am: 9bc286dd71
Change-Id: I17da945eaa609f40d9601109c435110599ed88f6
2018-04-23 15:47:30 -07:00
Tao Bao
98de595c59
Merge "Make update_verifier generic across verified boot versions." am: ea63f59469
...
am: abcac8e1e7
Change-Id: I22eb8e48264862f763c31813697af46a55d1eba7
2018-04-23 15:47:00 -07:00
Tao Bao
9bc286dd71
Merge "update_verifier: Move to Soong."
...
am: ed022fccdf
Change-Id: Icfbef50b7fbfb2acfc0ba3ff47953b39c778356a
2018-04-23 15:42:30 -07:00
Tao Bao
abcac8e1e7
Merge "Make update_verifier generic across verified boot versions."
...
am: ea63f59469
Change-Id: Ieaad12e638eee94323703d0808b961a1e2efa5ab
2018-04-23 15:42:01 -07:00
Tao Bao
ed022fccdf
Merge "update_verifier: Move to Soong."
2018-04-23 22:33:56 +00:00
Tao Bao
ea63f59469
Merge "Make update_verifier generic across verified boot versions."
2018-04-23 22:33:45 +00:00
Tao Bao
afb9fc29a2
update_verifier: Move to Soong.
...
Test: mmma -j bootable/recovery
Change-Id: I3a3574c89318304231c01f7633d32ece31df098c
2018-04-20 14:26:38 -07:00
Tao Bao
1cc0351915
Make update_verifier generic across verified boot versions.
...
This allows the update_verifier in a general system image to work across
devices that have different verified boot versions (i.e. not supported /
verified boot 1.0 / verified boot 2.0 / disabled).
Bug: 78283982
Test: Run recovery_component_test on both of marlin and walleye.
Test: Generate an OTA that has this CL. Install this OTA and check the
update_verifier log during the post-reboot verification, on both
of marlin (VB 1.0) and walleye (VB 2.0).
Test: Build and flash walleye image with verified boot disabled. Check
that update_verifier marks the slot as successfully booted.
Change-Id: I828d87d59f911786531f774ffcf9b2ad7c2ca007
2018-04-20 14:26:38 -07:00
Tao Bao
73edea3e67
Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch." am: bcb015239c am: 4cf3bc1875
...
am: 0d6de12e68
Change-Id: I1f37e53ac637ab58695006909f4c0bd7eb2f7303
2018-04-20 11:19:59 -07:00
Tao Bao
0d6de12e68
Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch." am: bcb015239c
...
am: 4cf3bc1875
Change-Id: I211d0252ae33cc8fc203360de8d982c2a3b597ae
2018-04-20 11:15:26 -07:00
Tao Bao
4cf3bc1875
Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch."
...
am: bcb015239c
Change-Id: I63246ae23e5c57d9723d616c5db28e8265fa7c52
2018-04-20 11:11:02 -07:00
Treehugger Robot
bcb015239c
Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch."
2018-04-20 18:03:42 +00:00
Tao Bao
8b0b0f1f02
applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch.
...
As they're accepting the SinkFn callback, it makes more sense to leave
the work to their callers.
Test: mmma -j bootable/recovery
Test: Run recovery_component_test on marlin.
Test: No other active user of the two functions.
Change-Id: I8d67b38ce037925442296f136b483e0c71983777
2018-04-20 09:27:50 -07:00
Tao Bao
0d4ef610f4
Merge "applypatch: Dump patch info on mismatching patching result." am: d2c32b281b am: ea70fd7d1d
...
am: 84a978cbcf
Change-Id: Idf456e315112c17165009994d0fc7ea8bc5df060
2018-04-19 15:14:57 -07:00
Tao Bao
84a978cbcf
Merge "applypatch: Dump patch info on mismatching patching result." am: d2c32b281b
...
am: ea70fd7d1d
Change-Id: Ie9c674215caac891702d09d30f6858226ffe807c
2018-04-19 14:52:35 -07:00
Tao Bao
ea70fd7d1d
Merge "applypatch: Dump patch info on mismatching patching result."
...
am: d2c32b281b
Change-Id: Ib43606f5fcd9e238b16b70b6dd519bb38a780dd3
2018-04-19 14:43:48 -07:00
Tao Bao
d2c32b281b
Merge "applypatch: Dump patch info on mismatching patching result."
2018-04-19 21:33:30 +00:00
Tao Bao
4f83430471
applypatch: Dump patch info on mismatching patching result.
...
After splitting the previously flaky
ApplyPatchModesTest#PatchModeEmmcTarget tests,
PatchModeEmmcTargetWithMultiplePatches now becomes the sole victim. This
CL dumps additional info to narrow down the cause.
Bug: 67849209
Test: `recovery_component_test` on marlin.
Test: It dumps additional info after using corrupt bonus.file.
Change-Id: Ic5436de457cc882a51d03f49d5cee70077f7d3df
2018-04-19 12:46:22 -07:00
Zhomart Mukhamejanov
6139a5b455
Merge "Add sample_updater style check to PREUPLOAD.cfg" am: 73e6644777 am: 11e31203a6
...
am: b21a990e75
Change-Id: I1151d68bd755d05cc454bfbaf7d5c55c1e289340
2018-04-17 18:14:06 -07:00
Zhomart Mukhamejanov
b21a990e75
Merge "Add sample_updater style check to PREUPLOAD.cfg" am: 73e6644777
...
am: 11e31203a6
Change-Id: Idcc2df9a84b6734c875da1f102eb7ba4ca6f9e62
2018-04-17 18:08:33 -07:00
Zhomart Mukhamejanov
11e31203a6
Merge "Add sample_updater style check to PREUPLOAD.cfg"
...
am: 73e6644777
Change-Id: I5acb461de5e0af89ffc903363711d9bb0dc05bc1
2018-04-17 18:02:30 -07:00
Zhomart Mukhamejanov
73e6644777
Merge "Add sample_updater style check to PREUPLOAD.cfg"
2018-04-18 00:52:20 +00:00
Zhomart Mukhamejanov
0e007e8edc
Add sample_updater style check to PREUPLOAD.cfg
...
Test: N/A
Change-Id: I13f4295a85d50c0a63cac5680e7a3200b0e6c909
2018-04-17 16:09:31 -07:00
Tao Bao
d57f3c7736
Merge "tests: Move ResourcesTest into component test." am: 07d0032def am: 9adbc572a3
...
am: 3b8d2df76d
Change-Id: I3ab2cda5dcb385fa769ad246a656d2e0b30edbda
2018-04-16 18:14:43 -07:00
Tao Bao
3b8d2df76d
Merge "tests: Move ResourcesTest into component test." am: 07d0032def
...
am: 9adbc572a3
Change-Id: Ia03cd4b6e5267cfd015190a840d3630648c832c1
2018-04-16 17:39:17 -07:00
Tao Bao
9adbc572a3
Merge "tests: Move ResourcesTest into component test."
...
am: 07d0032def
Change-Id: I1e6576ab1ae5eacc70b2cabba8d11b78fbdd88d5
2018-04-16 17:13:38 -07:00
Treehugger Robot
07d0032def
Merge "tests: Move ResourcesTest into component test."
2018-04-17 00:00:00 +00:00
Chih-Hung Hsieh
f6370a8ba7
Merge "Disable lld where it fails." am: 0c8eea86f9 am: dd2277a9bd
...
am: 4d92ca3f65
Change-Id: I5d7a0970bcec57c478e6819bf41dc5db23822d89
2018-04-16 12:00:49 -07:00
Chih-Hung Hsieh
4d92ca3f65
Merge "Disable lld where it fails." am: 0c8eea86f9
...
am: dd2277a9bd
Change-Id: Ic245166068d1c87a1fbcb2fa36a0141914e9cd34
2018-04-16 11:48:42 -07:00
Chih-Hung Hsieh
dd2277a9bd
Merge "Disable lld where it fails."
...
am: 0c8eea86f9
Change-Id: I28871cb18da2825e4e6f951fc95debd6dc7225ae
2018-04-16 11:45:09 -07:00