Commit Graph

9577 Commits

Author SHA1 Message Date
Tianjie Xu a18e572537 Merge "Remove otafault" am: a1e3d67bd7 am: 3f288e4389
am: 6b95e5cfd3

Change-Id: I7e2979511edcbb1f8cc2b789eca8bafa5751a926
2018-08-27 19:26:21 -07:00
Tianjie Xu 6b95e5cfd3 Merge "Remove otafault" am: a1e3d67bd7
am: 3f288e4389

Change-Id: I5346a15d138a1ebc994cf6dd9beecd23a97d3d78
2018-08-27 19:22:19 -07:00
Tianjie Xu 3f288e4389 Merge "Remove otafault"
am: a1e3d67bd7

Change-Id: I9615dbf572f34fb6fa9b3d2b37e40e81b66fdc33
2018-08-27 19:17:15 -07:00
Tianjie Xu a1e3d67bd7 Merge "Remove otafault" 2018-08-28 02:05:17 +00:00
Tianjie Xu 22f11205a1 Remove otafault
Now it's less beneficial to inject I/O faults since we don't see many of
them. Remove the library that mocks I/O failures. And switch to android::base
I/O when possible.

Bug: 113032079
Test: unit tests pass
Change-Id: I9f2a92b7ba80f4da6ff9e2abc27f2680138f942c
2018-08-27 17:16:19 -07:00
Captain Throwback 9d6feb5311 twrp: use ANDROID_ROOT environment variable
instead of hard-coded /system path

I updated most of the references I found,
but there might be more

For devices that have to mount system at /system_root,
this allows system to be bind mounted to /system
and detected properly by TWRP

Change-Id: I9f142fd8cec392f5b88e95476258dab9c21a9aac
2018-08-24 12:47:45 -04:00
Ethan Yonker 58f2132bc3 Merge AOSP android-9.0.0_r3
Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0

Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4
2018-08-24 11:17:39 -05:00
Tao Bao 096c66546e Merge "uncrypt: Depend on commonly used shared libs." am: 9d7f918506 am: 9d595b13f9
am: 1487523804

Change-Id: I36ffdd85806d63a9fbf997a226cb65a1c8d07f24
2018-08-23 10:53:38 -07:00
Tao Bao 1487523804 Merge "uncrypt: Depend on commonly used shared libs." am: 9d7f918506
am: 9d595b13f9

Change-Id: I2e901bdea914291ccad0cb6884c1e0a2b1b36726
2018-08-23 10:49:54 -07:00
Tao Bao 9d595b13f9 Merge "uncrypt: Depend on commonly used shared libs."
am: 9d7f918506

Change-Id: Ib272ec99299119d64ff0ae02295362f0c92bf7f3
2018-08-23 10:45:53 -07:00
Treehugger Robot 9d7f918506 Merge "uncrypt: Depend on commonly used shared libs." 2018-08-23 17:38:42 +00:00
Elliott Hughes 30ea428789 Merge "Add /dev/stdin, /dev/stdout, and /dev/stderr in recovery too." am: 11f766af4e am: a35802b71d
am: f64f65b1c3

Change-Id: I6f4aa146e17a0d38a06fc9a1208d0cb204c6d731
2018-08-23 10:13:58 -07:00
Elliott Hughes f64f65b1c3 Merge "Add /dev/stdin, /dev/stdout, and /dev/stderr in recovery too." am: 11f766af4e
am: a35802b71d

Change-Id: Ic28d92ddf72c57d0e2ec3cedf2c737787491063c
2018-08-23 10:10:09 -07:00
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
Tao Bao d881d4f205 uncrypt: Depend on commonly used shared libs.
We already have these shared libraries on device. And `uncrypt` doesn't
need to be statically linked (it wasn't, even prior to this change).

With this change, the size of uncrypt goes down from 139KiB to 33KiB
(aosp_marlin-userdebug).

Test: Build and flash on marlin. Trigger a factory reset (which calls
      `uncrypt` to set up the BCB).
Change-Id: I77e3c82e8ce3734019da75c48928d881cb7ef0f0
2018-08-22 17:59:21 -07:00
Zhomart Mukhamejanov 55c1c840d0 Merge "Move ab_streaming_metadata under ab_config." am: ab7e652484 am: e30a243d0a
am: 7b68b5db14

Change-Id: I39cbb95dc25eee6cdee18f63b50ea464964eb61c
2018-08-22 13:56:53 -07:00
Zhomart Mukhamejanov 7b68b5db14 Merge "Move ab_streaming_metadata under ab_config." am: ab7e652484
am: e30a243d0a

Change-Id: Ie82aa5d182046327778bc97c956049e513351407
2018-08-22 13:38:45 -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 771161e793 Merge "recovery: Add "boot-fastboot" command to BCB." am: 0115b79cbd am: 4ba5c3c7de
am: e105c4996f

Change-Id: Id4244f83eaf4fb8b1fdb2156d6f780bc2702804e
2018-08-22 04:32:49 -07:00
Tao Bao b3e1fbb67d Merge "Depend on mke2fs.conf.recovery." am: aa536568b3 am: e6c86871f4
am: 6a122dceb3

Change-Id: I1e1e887629a586dfb32321a054369eda7fa8a276
2018-08-22 03:52:59 -07:00
David Anderson e105c4996f Merge "recovery: Add "boot-fastboot" command to BCB." am: 0115b79cbd
am: 4ba5c3c7de

Change-Id: I50a4705253d78d183740fb8da0ee6601a9ef9b93
2018-08-22 01:05:30 -07: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
Tao Bao 6a122dceb3 Merge "Depend on mke2fs.conf.recovery." am: aa536568b3
am: e6c86871f4

Change-Id: Ie3677c5edf9ff3d0a9e2bfccabfec97bab1d89d0
2018-08-21 20:22:45 -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 d8e8c7b6fa Merge "tests: Remove {old,new}.file." am: 09ce7686f2 am: 14d87881d8
am: 0a32c73326

Change-Id: I2f5a77cca65eb244217ca7b7b37a5d4bf9f3c732
2018-08-20 11:22:44 -07:00
Tao Bao 0a32c73326 Merge "tests: Remove {old,new}.file." am: 09ce7686f2
am: 14d87881d8

Change-Id: Ic1b92812149af9f94f195c819857fdeb6944af2b
2018-08-20 11:18:41 -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 de5c360bc8 Merge "updater: Add TransferList class." am: 102d14d6d1 am: 5cf27834f3
am: adf6ca1f71

Change-Id: I5333f68a4d182c4f8412ef076d68fa40a848a04d
2018-08-17 12:21:22 -07:00
Tao Bao adf6ca1f71 Merge "updater: Add TransferList class." am: 102d14d6d1
am: 5cf27834f3

Change-Id: Id73d542e0f8345b54a8d41820c9a61cb4339239b
2018-08-17 11:58:11 -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 1b747a390e Merge "Add a python binary to generate the protobuf for care_map" am: fae0881528 am: 0901a08fc2
am: a47f985edd

Change-Id: I7aae377ba333d7e163eda743a02c3bb04002877a
2018-08-16 22:20:53 -07:00
Tao Bao 3c2b399820 Merge "ui: Only set brightness when needed." am: cf01f7dcbe am: d03842982f
am: 6ebca741fb

Change-Id: I240062e09d856b1b695174209b4f23d3af643429
2018-08-16 22:14:51 -07:00
Tao Bao 606c46a1ff Merge "updater: Add SourceInfo::{ReadAll,DumpBuffer,Overlaps}." am: d460afe963 am: 559d01ff16
am: b46691b03d

Change-Id: Ie7419c5978452b0b797888e75ffcbe7213002c96
2018-08-16 21:45:18 -07:00
Tianjie Xu a47f985edd Merge "Add a python binary to generate the protobuf for care_map" am: fae0881528
am: 0901a08fc2

Change-Id: I4e8671c015abbc6699b2903187630784d30639ad
2018-08-16 20:37:50 -07:00
Tao Bao 6ebca741fb Merge "ui: Only set brightness when needed." am: cf01f7dcbe
am: d03842982f

Change-Id: I3e0786705df73af571b24b70c93fe90859f72a14
2018-08-16 20:34:28 -07:00
Tao Bao b46691b03d Merge "updater: Add SourceInfo::{ReadAll,DumpBuffer,Overlaps}." am: d460afe963
am: 559d01ff16

Change-Id: Ief7dbd3f6e360a55068ca6ab9caa95d1364f3f91
2018-08-16 20:22:42 -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