Commit Graph

7296 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 9e76ce0ad6 Use the non-LTO, non-PGO version of libhwbinder
am: 2ca4a403e7

Change-Id: Ic2cf355dd9faa2ed1c04f2673a41974df2c9f4a9
2018-04-10 11:29:27 -07:00
Pirama Arumuga Nainar 2ca4a403e7 Use the non-LTO, non-PGO version of libhwbinder
Bug: http://b/77320844

Android.mk doesn't have support for PGO either.  This causes linker
error (about missing __llvm_profile symbols) in the PGO-instrumentation
enabled builds in the release branch.

Test: m ANDROID_PGO_INSTRUMENT=ALL
Change-Id: Ib5dfdea88073bd95da2cd02e92c85bfffcca80d6
2018-04-09 17:43:25 +00:00
android-build-team Robot 0a968d2f62 Snap for 4706961 from 7fdb6355e4 to pi-release
Change-Id: Iea61f6f7d5d8b6f825a06d28b3a6f4d8ef7cbe38
2018-04-08 07:26:24 +00:00
Yi Kong bbb5b84c51 Merge "Use non-LTO variant of libhwbinder" into pi-dev
am: 7fdb6355e4

Change-Id: Ib78dee41815c782e0377d2e1fcb3754010ec8bb2
2018-04-06 13:36:38 -07:00
TreeHugger Robot 7fdb6355e4 Merge "Use non-LTO variant of libhwbinder" into pi-dev 2018-04-06 20:25:02 +00:00
Jaegeuk Kim 2e5dc84d51 recovery: enable fsverity feature bit
Bug: 74604441
Bug 67380979
Change-Id: Iab1cc9aef356f0ddf6e2491578a2bd53009182ce
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-04-06 10:17:47 -07:00
Jaegeuk Kim deb83911b0 install: mkfs.f2fs: specify sector size for target image size
am: 1224544806

Change-Id: If7019ce86b3936534bb9db6d33135c3c9d3028fd
2018-04-05 10:20:24 -07:00
android-build-team Robot 3ea872cc29 Snap for 4701683 from 848f227eea to pi-release
Change-Id: I3de6f225d9d796891ca881e06529741a1279079b
2018-04-05 07:23:24 +00:00
Jaegeuk Kim 975cecfeec Merge "install: mkfs.f2fs: specify sector size for target image size" am: ea8a6a9af2
am: 70ac7ea78f

Change-Id: Iac2bc863bbca439de0df116c6b4a026744ca228b
2018-04-05 00:03:51 -07:00
Jaegeuk Kim 70ac7ea78f Merge "install: mkfs.f2fs: specify sector size for target image size"
am: ea8a6a9af2

Change-Id: I0effdb5d30cc496d55e2bb722404e07bcd2561e3
2018-04-04 23:56:49 -07:00
Treehugger Robot ea8a6a9af2 Merge "install: mkfs.f2fs: specify sector size for target image size" 2018-04-05 06:48:17 +00:00
Jaegeuk Kim 16b428c71a [automerger skipped] f2fs: support f2fs by setting unmovable bit for package file
am: 848f227eea  -s ours

Change-Id: Id41502973521789f22aff6fe7a63602a67c75833
2018-04-04 22:20:55 -07:00
Jaegeuk Kim fc66f3fbc6 install: mkfs.f2fs: specify sector size for target image size
The total sectors that we want to format is used in different meanings from
various users. This notifies its size based on 512 bytes explicitly.

Bug: 76407663
Change-Id: I20687b40a1733d3b459a45f8b64a338c37a7bc95
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-04-04 21:16:19 -07:00
Jaegeuk Kim 1224544806 install: mkfs.f2fs: specify sector size for target image size
The total sectors that we want to format is used in different meanings from
various users. This notifies its size based on 512 bytes explicitly.

Bug: 76407663
Change-Id: I20687b40a1733d3b459a45f8b64a338c37a7bc95
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-04-04 21:14:01 -07:00