android-build-team Robot
30ebb8a49d
Snap for 4740273 from 766a410388 to qt-release
...
Change-Id: I7118415a5a1a2db62790556336b922ea9c7016f9
2018-04-24 09:30:38 +00: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
android-build-team Robot
c040343737
Snap for 4736303 from 73edea3e67 to qt-release
...
Change-Id: Ib2ebbdcd096320041723b75224a9b69d5b219a2b
2018-04-21 09:34:44 +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
android-build-team Robot
a47f214ff4
Snap for 4733905 from 0d4ef610f4 to qt-release
...
Change-Id: Id16a5b61abd465f6791721b5ae54afc952c72ed9
2018-04-20 09:35:40 +00: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
android-build-team Robot
f44a96f89f
Snap for 4726042 from d57f3c7736 to qt-release
...
Change-Id: I4561f9133ff3e1f1d84029bd8ab61efcca7cad8d
2018-04-17 09:35:40 +00: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
Tao Bao
6b28f05c5b
tests: Move ResourcesTest into component test.
...
Although the tests were initially written for checking the validity of
the text images, it doesn't hurt to run them continuously as part of the
component test (recovery_manual_test requires reboots during the run,
due to the nature of the tests of recovery-{refresh,persist}). This also
allows detecting breaking changes to libminui or libpng.
There's a catch that the ResourcesTest won't be triggered via `atest`,
as the res-* testdata won't be picked up via AndroidTest.xml. Explored
a few options but not addressing that in this CL:
- `atest` is not fully working in AOSP yet (missing support in
tools/tradefederation/core/atest/atest.py).
- `atest` doesn't allow specifying the testdata with path in the 'push'
option.
- It won't fail the test run though, as ResourcesTest will skip the
tests automatically when it finds no text image file.
- APCT and manual `adb sync data` are not affected, and I don't see an
active user of `atest` other than a tool for manual test invocation.
- Unrelated to this CL, `atest` doesn't seem to work well with
recovery_component_test or recovery_unit_test while we have both of
them in one AndroidTest.xml. It randomly triggers only one of them,
despite of the given test name. When splitting AndroidTest.xml into
two, it tends to pick up the wrong testdata subdir and gives wrong
results.
Test: Run recovery_manual_test and recovery_component_test on marlin.
Change-Id: I3a237499a7770356e14085674bc8b9cb4551db85
2018-04-16 11:29:06 -07:00
Treehugger Robot
0c8eea86f9
Merge "Disable lld where it fails."
2018-04-16 18:25:33 +00:00
Chih-Hung Hsieh
83847e6ed9
Disable lld where it fails.
...
Bug: 77543887
Test: make checkbuild and boot
Change-Id: I4134a8eec592dac347c84cc7dc3f9f99f27bc50c
2018-04-16 09:39:07 -07:00
android-build-team Robot
f944a232ef
Snap for 4722634 from 563a102d0f to qt-release
...
Change-Id: Ie8d62c34b45a2bb05c6f895a0f2af7c620a4e236
2018-04-15 09:33:40 +00:00
Tao Bao
563a102d0f
Merge "Expose PngHandler via resources.h." am: 3c8fdf3274 am: c41aba80b7
...
am: 488e2c1e84
Change-Id: I9a5efd24428426f90b54e9fc0569a01332b0eabd
2018-04-14 17:11:27 -07:00
Josh Gao
3fcf53f069
Merge "minadbd: track signature change of service_to_fd." am: 5ac8cfe1ed am: 959f010f7b
...
am: 3d59e50db5
Change-Id: I30f79a5ec7415bdd04fd4fbeb6f09972b1368140
2018-04-14 16:43:38 -07:00
Josh Gao
5e40fe802a
Merge "minadbd: track signature change of service_to_fd." into pi-dev am: eacb9c0697
...
am: 4c997ef293
Change-Id: I6240efedef50a67428c9133435c7b79df3fc8462
2018-04-14 16:38:48 -07:00
Tao Bao
488e2c1e84
Merge "Expose PngHandler via resources.h." am: 3c8fdf3274
...
am: c41aba80b7
Change-Id: Iabf5238f7f150ab721d402b7c4ab6efd77430a11
2018-04-14 16:23:39 -07:00
Tao Bao
c41aba80b7
Merge "Expose PngHandler via resources.h."
...
am: 3c8fdf3274
Change-Id: I2a120d4250bfb0c32129fd3409c7f1c13f28c20a
2018-04-14 16:08:47 -07:00
Josh Gao
3d59e50db5
Merge "minadbd: track signature change of service_to_fd." am: 5ac8cfe1ed
...
am: 959f010f7b
Change-Id: If8f891253b4bef9e7264f28cdd79108c3e4d8d42
2018-04-14 16:03:26 -07:00
Josh Gao
4c997ef293
Merge "minadbd: track signature change of service_to_fd." into pi-dev
...
am: eacb9c0697
Change-Id: I863f450cffc2c86b0f2c4a5bdf3b9958355a5dea
2018-04-14 15:55:40 -07:00
Josh Gao
959f010f7b
Merge "minadbd: track signature change of service_to_fd."
...
am: 5ac8cfe1ed
Change-Id: I6e308545ecfcf992f649cf24a8967acf58cea432
2018-04-14 15:55:39 -07:00
TreeHugger Robot
eacb9c0697
Merge "minadbd: track signature change of service_to_fd." into pi-dev
2018-04-14 15:33:14 +00:00
android-build-team Robot
6204045212
Snap for 4721377 from ee18bb5739 to qt-release
...
Change-Id: I80b06ee8d264037d28331f8221fa2ee9e82696f6
2018-04-14 09:37:48 +00:00