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
Humberto Borba
84e16158ca
toybox: Fix build for android 8.1
...
Fix toybox build at android 8.1.
PS: xzcat support removed
Signed-off-by: Humberto Borba <humberos@gmail.com >
Change-Id: I185231bacf24db073f66eb57a146d7d1b64ffc2a
2018-04-19 02:26:21 +02: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
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
d02bb6d67b
Snap for 4722539 from eacb9c0697 to pi-release
...
Change-Id: I97cc6990b6d75fcfd392494df1e5e51a406cca3f
2018-04-15 07:22:53 +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
Treehugger Robot
3c8fdf3274
Merge "Expose PngHandler via resources.h."
2018-04-14 01:04:35 +00:00
Josh Gao
84c82a8142
minadbd: track signature change of service_to_fd.
...
Bug: http://b/37066218
Bug: http://b/71898863
Test: treehugger
Change-Id: I5f2b14c65cff8d41dd3230d78b87e3e27e489bf6
(cherry picked from commit 570b08b790 )
2018-04-13 17:49:10 -07:00
Treehugger Robot
5ac8cfe1ed
Merge "minadbd: track signature change of service_to_fd."
2018-04-14 00:43:33 +00:00
Josh Gao
570b08b790
minadbd: track signature change of service_to_fd.
...
Bug: http://b/37066218
Bug: http://b/71898863
Test: treehugger
Change-Id: I5f2b14c65cff8d41dd3230d78b87e3e27e489bf6
2018-04-13 16:10:34 -07:00
Tao Bao
3d0cd1d036
Expose PngHandler via resources.h.
...
As a private header for testing purpose. PngHandler additionally loads a
given filename if the one with '/res/images' prefix is not available. It
also provides color_type/bit_depth that are parsed from the PNG file.
This allows reusing the same code for the ResourcesTest (renamed from
ResourceTest).
Test: Run recovery_manual_test on marlin.
Change-Id: I3f939d79a1cb1b83a899847dbe2d51bde15d16d8
2018-04-13 15:25:50 -07:00
Tianjie Xu
ee18bb5739
Merge "Remove the old log files if cache space is insufficient for OTA" am: 0b3e25719d am: 8982db6ae1
...
am: a1d89277dd
Change-Id: Ic60edfc13549b3b2e288045a3552c6978398864a
2018-04-13 13:46:50 -07:00
Tianjie Xu
a1d89277dd
Merge "Remove the old log files if cache space is insufficient for OTA" am: 0b3e25719d
...
am: 8982db6ae1
Change-Id: I2d4aa22d3d77add42a99cfdf8610e172640d40a9
2018-04-13 13:37:23 -07:00
Tianjie Xu
8982db6ae1
Merge "Remove the old log files if cache space is insufficient for OTA"
...
am: 0b3e25719d
Change-Id: I345fe6a906c71776de63a7c782e4ed4b1050c8c0
2018-04-13 13:33:21 -07:00
Tianjie Xu
0b3e25719d
Merge "Remove the old log files if cache space is insufficient for OTA"
2018-04-13 20:23:37 +00:00
Tianjie Xu
d5fbcc1ba9
Remove the old log files if cache space is insufficient for OTA
...
We set the limit of the max stash size to 80% of cache size. But the
cache space can still be insufficient for the update if the log files
occupy a large chunk of /cache. So remove the old logs for now to make
room for the update.
Bug: 77528881
Test: unit tests pass
Change-Id: Ia8bcb0ace11f8164ad9290bfb360e08e31d282cb
2018-04-13 11:33:47 -07:00
android-build-team Robot
add3e9c1e5
Snap for 4713750 from 257dd337da to pi-release
...
Change-Id: If094ad9fb98a85c4b1dcbdcbdde23d4e48b65939
2018-04-11 07:27:26 +00:00
Jaegeuk Kim
432e844d2b
Merge "recovery: enable fsverity feature bit" into pi-dev am: 257dd337da
...
am: ae53bb66ca
Change-Id: Id7e12c90e38d7c1a3ae238871aecde633677404f
2018-04-10 21:23:59 -07:00
Jaegeuk Kim
ae53bb66ca
Merge "recovery: enable fsverity feature bit" into pi-dev
...
am: 257dd337da
Change-Id: I1a7ebb46cdcb32952d4033916b19f41ba91a4689
2018-04-10 21:07:28 -07:00
TreeHugger Robot
257dd337da
Merge "recovery: enable fsverity feature bit" into pi-dev
2018-04-11 03:59:58 +00:00
Pirama Arumuga Nainar
6e04506395
Use the non-LTO, non-PGO version of libhwbinder am: 2ca4a403e7
...
am: 9e76ce0ad6
Change-Id: Ia222dd2879307bd3addf49aeb80c6abfcb98ba94
2018-04-10 12:04:00 -07:00