Commit Graph

6534 Commits

Author SHA1 Message Date
Elliott Hughes a35802b71d Merge "Add /dev/stdin, /dev/stdout, and /dev/stderr in recovery too."
am: 11f766af4e

Change-Id: Ib031aad6fb48dae8c46c14068d07bf3f6f55ce72
2018-08-23 10:06:22 -07:00
Treehugger Robot 11f766af4e Merge "Add /dev/stdin, /dev/stdout, and /dev/stderr in recovery too." 2018-08-23 16:54:33 +00:00
Elliott Hughes a4495b5ee2 Add /dev/stdin, /dev/stdout, and /dev/stderr in recovery too.
Now these are in the main image, there's some chance of code assuming
they're present in recovery too (or command-line users using them out
of habit).

Bug: http://b/31824379
Test: builds
Change-Id: Ia19272cd1959685765099f3e15d1d1e63babd279
2018-08-23 08:31:59 -07:00
Zhomart Mukhamejanov e30a243d0a Merge "Move ab_streaming_metadata under ab_config."
am: ab7e652484

Change-Id: I0dfcd04c3f9374b846c0bc40053b342ddb9294ee
2018-08-22 13:13:12 -07:00
Zhomart Mukhamejanov ab7e652484 Merge "Move ab_streaming_metadata under ab_config." 2018-08-22 18:38:06 +00:00
Zhomart Mukhamejanov 88712f7610 Move ab_streaming_metadata under ab_config.
Add new config: ab_config.verify_payload_metadata.

Change-Id: I521dff92166c33dd9c2efa498dc599fe4bc83fde
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
Test: mmm, junit
Bug: 77150191
2018-08-22 18:37:51 +00:00
David Anderson 4ba5c3c7de Merge "recovery: Add "boot-fastboot" command to BCB."
am: 0115b79cbd

Change-Id: Id47df0b7923f6a48f14ad41f11fcf56f7c0f2f1e
2018-08-21 22:42:11 -07:00
Treehugger Robot 0115b79cbd Merge "recovery: Add "boot-fastboot" command to BCB." 2018-08-22 01:48:58 +00:00
Tao Bao e6c86871f4 Merge "Depend on mke2fs.conf.recovery."
am: aa536568b3

Change-Id: I8618e5453dc90ce122dd556f78822aa743ee7031
2018-08-21 18:12:50 -07:00
David Anderson eee4e260f9 recovery: Add "boot-fastboot" command to BCB.
This change adds a new "boot-fastboot" command in order to boot into fastboot
without overwriting recovery tasks. This also allows bootloaders to boot
directly into userspace fastboot from the bootloader menu, or via
bootloader fastboot.

Bug: 112277594
Test: adb reboot fastboot
Change-Id: Ia0c9a0961a76c6cbe19486590179abaa50d93f58
2018-08-21 16:04:57 -07:00
Tao Bao aa536568b3 Merge "Depend on mke2fs.conf.recovery." 2018-08-21 22:35:48 +00:00
Tao Bao 7c074d97bd Depend on mke2fs.conf.recovery.
Bug: 112780007
Test: `m dist` along with other changes in the topic. Check the file
      under recovery. Trigger factory reset from recovery UI.
Change-Id: I2fb6954576eefecea60712a21506a2aeb1cecc53
2018-08-21 12:32:03 -07:00
Tao Bao 14d87881d8 Merge "tests: Remove {old,new}.file."
am: 09ce7686f2

Change-Id: Ie3f23bd37cb29258bdf785548cbf2d85c457a04e
2018-08-20 11:13:54 -07:00
Treehugger Robot 09ce7686f2 Merge "tests: Remove {old,new}.file." 2018-08-20 17:48:56 +00:00
Tao Bao cdbe58a2a2 tests: Remove {old,new}.file.
They serve the same purpose as {boot,recovery}.img, except that they're
not structured to be imgdiff'd. Remove the two files and replace all the
uses with {boot,recovery}.img instead.

Bug: 110106408
Test: Run recovery_{unit,component}_test on marlin.
Change-Id: I8e71187d5b0c142ad932f33717f6fae364b43abc
2018-08-20 09:08:35 -07:00
Tao Bao 5cf27834f3 Merge "updater: Add TransferList class."
am: 102d14d6d1

Change-Id: I10eac56d0c4c26d07b301a9c746d5e3f98e09811
2018-08-17 11:52:20 -07:00
Tao Bao 102d14d6d1 Merge "updater: Add TransferList class." 2018-08-17 18:31:54 +00:00
Tao Bao f8811bbd3a updater: Add TransferList class.
This would be the top-level class that represents and holds the info
parsed from a transfer list file.

Bug: 112151972
Test: Run recovery_unit_test and recovery_component_test on marlin.
Change-Id: I83b54df9d1411542eeeb8ef4a2db167e97f989c3
2018-08-17 09:37:26 -07:00
Tianjie Xu 0901a08fc2 Merge "Add a python binary to generate the protobuf for care_map"
am: fae0881528

Change-Id: I259dcf3ba7d3840436d96640e91a00cf9be0fdf3
2018-08-16 17:52:05 -07:00
Tao Bao d03842982f Merge "ui: Only set brightness when needed."
am: cf01f7dcbe

Change-Id: If9747c9fdb2822cacad87828ad627b72742e9aff
2018-08-16 17:44:47 -07:00
Tao Bao 559d01ff16 Merge "updater: Add SourceInfo::{ReadAll,DumpBuffer,Overlaps}."
am: d460afe963

Change-Id: Ib3798641e976658e8288150a2d3fea80d415ed33
2018-08-16 17:28:16 -07:00
Tianjie Xu fae0881528 Merge "Add a python binary to generate the protobuf for care_map" 2018-08-17 00:02:24 +00:00
Tianjie Xu 7e520d24fe Add a python binary to generate the protobuf for care_map
This binary parses the legacy care_map text in the input file and writes
the generated protobuf message into the output file. For test purpose,
it also has a "--parse_proto" option to reverse the process and convert
a protobuf message file into plain text.

The build script will then call the binary to generate the care_map.txt
in the new format.

Bug: 77867897
Test: Run the binary to convert a care_map.txt, run update_verifier
Change-Id: I3ca65e19027404806132aa8d51e9bff766630c99
2018-08-16 15:09:32 -07:00
Tao Bao cf01f7dcbe Merge "ui: Only set brightness when needed." 2018-08-16 20:10:26 +00:00
Tao Bao d460afe963 Merge "updater: Add SourceInfo::{ReadAll,DumpBuffer,Overlaps}." 2018-08-16 19:26:37 +00:00
Tao Bao 53be332711 ui: Only set brightness when needed.
There is a regression due to recent change in commit
b76af93ab5, where it started to set
brightness to normal on every key input. This is unneeded and spamming
the recovery log.

Test: Run recovery_unit_test on marlin.
Test: Built and boot into recovery image. Press a few keys, then check
      the recovery log.
Change-Id: Ia3a7ea400bcccdebbb27a6a7586e435bfb915923
2018-08-16 11:54:01 -07:00
Tao Bao 3c8927390e updater: Add SourceInfo::{ReadAll,DumpBuffer,Overlaps}.
Bug: 112151972
Test: Run recovery_unit_test on marlin.
Change-Id: Ica2a7b3c768f5d8ca5d591a9560bca9f8ed847c5
2018-08-16 11:09:35 -07:00
Tao Bao d9067aed88 Merge "tests: Add the missing tests in applypatch_modes_test.cpp."
am: f83d9f6b71

Change-Id: I3ab7b006384ee1fda877a5edb1c3f5af42722dff
2018-08-15 18:44:51 -07:00
Tao Bao f13b38ca72 Merge "Fixing the Mac SDK build"
am: 0b66e96da5

Change-Id: I2979bf2260a5e254b6247061baa01d1ae8eb1e9e
2018-08-15 18:44:36 -07:00
Tao Bao f83d9f6b71 Merge "tests: Add the missing tests in applypatch_modes_test.cpp." 2018-08-16 01:16:57 +00:00
Tao Bao 0b66e96da5 Merge "Fixing the Mac SDK build" 2018-08-16 01:10:49 +00:00
Tianjie Xu 5c1b333bde Merge "Further compress the recovery animation file"
am: c8e0292b61

Change-Id: I3776285237eb48cb72619117b7a9414b34eee0e0
2018-08-15 16:43:00 -07:00
Andreas Huber 435dfac15c Fixing the Mac SDK build
recovery_host_test is now excluded from darwin targets as its
dependency libimgdiff is.

Change-Id: I6aa085125109ed2218572df97f35289b71c354ab
2018-08-15 16:11:25 -07:00
Tao Bao 26b645447f tests: Add the missing tests in applypatch_modes_test.cpp.
This file was somehow missed when converting from Android.mk to
Android.bp. This CL addresses the issue by picking up all the .cpp files
in the test source dir.

Test: Run recovery_{unit,component}_test on marlin. Check the reported
      number of tests (94 for unit test and 157 for component test).
Change-Id: I50435b07fcb8602ef7b3f7e7d3a69e10b6a5932d
2018-08-15 15:34:46 -07:00
Tianjie Xu c8e0292b61 Merge "Further compress the recovery animation file" 2018-08-15 22:30:55 +00:00
Tianjie Xu e45f359e9c Further compress the recovery animation file
The res/images/loop.*png can be further compressed with "pngquant
--quality 0-10"; and the difference is not noticeable to humans
under recovery. And This reduces the animation pictures under res-xxxhdpi
from 2.7M to 1.2M.

Note that the *_text.png files can't be compressed this way because they
requires lossless compression to keep the embedded locales intact.

Bug: 112494634
Test: Run recovery graphic tests.
Change-Id: I2cefaea8e037cb09cb4e4735d1b86e82da9e6875
2018-08-15 19:07:08 +00:00
Tao Bao 6956957499 Merge "tests: Move to Android.bp."
am: b1ff1bc43b

Change-Id: I3d964a6f4d60b031209a02625b2fdee5d2c75a6b
2018-08-15 11:04:59 -07:00
Tao Bao b1ff1bc43b Merge "tests: Move to Android.bp." 2018-08-15 17:56:19 +00:00
Tao Bao 07c78fe446 Merge "Track the change to update_engine_sideload path."
am: 97de9c3d3e

Change-Id: I7b16e7b90ad473581216dda7f991245d7a71525d
2018-08-14 22:25:44 -07:00
Tao Bao ef5e38fef0 tests: Move to Android.bp.
Also separate libupdater_defaults out to be shareable.

It turns out the `data` property in `cc_test` doesn't follow symlinks as
LOCAL_TEST_DATA does in Android.mk. This CL creates a filegroup in
top-level Android.bp in order to pick up the testdata for ResourcesTest.

Test: `mmma -j bootable/recovery` with aosp_marlin-userdebug
Test: Run recovery_{unit,component,manual}_test on marlin.
Test: Run recovery_host_test.
Change-Id: I4532ab25aeb83c0b0baa8051d5fe34ba7b910a35
2018-08-14 21:46:45 -07:00
Tao Bao 97de9c3d3e Merge "Track the change to update_engine_sideload path." 2018-08-15 01:46:31 +00:00
Hridya Valsaraju b0851cf8c4 Merge "Add fastboot mode to recovery"
am: 19a5316412

Change-Id: I115017c90c8ee4a7b28a2742462d157585b1edaa
2018-08-14 15:55:00 -07:00
Yifan Hong c7c56f0e90 Merge "recovery uses IHealth::getService"
am: ce2f0d85fb

Change-Id: Ic22bf13545f1261f288dc47df9ee123913ad8028
2018-08-14 15:51:08 -07:00
Treehugger Robot 19a5316412 Merge "Add fastboot mode to recovery" 2018-08-14 21:25:50 +00:00
Yifan Hong ce2f0d85fb Merge "recovery uses IHealth::getService" 2018-08-14 21:06:58 +00:00
Tao Bao 2cc9bbb1ec Track the change to update_engine_sideload path.
Bug: 112494634
Test: Build and boot into recovery image on taimen. Verify that
      `Apply updates from ADB` keeps working.
Test: Run recovery_component_test on marlin.

Change-Id: I9ee8834053fda79a4fd77bfa83eab3cc51a90dff
2018-08-14 12:34:46 -07:00
Tao Bao d1386d8385 Merge "updater: Move libupdater to Soong."
am: c205dd9d43

Change-Id: I00ba7327c02eaae9e1d9262dc6b4ea03179e1e9f
2018-08-14 10:02:27 -07:00
Tao Bao 3eceebf7eb Merge "recovery: Drop the dependency on libcrypto_utils.so and libsparse.so."
am: 19d002d33f

Change-Id: Ied2c8510c24e8e1d698beefbc36a84bea26aa5aa
2018-08-14 10:01:43 -07:00
Tianjie Xu 9b64295f3e Merge "Add the hash_tree_info class in Command"
am: c0195801dc

Change-Id: I32500b2045271d498d3a67b85e5ec0a51ac8da0c
2018-08-14 09:48:57 -07:00
Tao Bao c205dd9d43 Merge "updater: Move libupdater to Soong." 2018-08-14 16:43:15 +00:00