Tao Bao
cf4d9c711b
Merge "Remove res-560dpi symlink." am: 02986d381e am: 75dd6f652d
...
am: 19c17b101e
Change-Id: Iadbfe042a85237ce827464a8c83c49899729d10b
2018-09-06 13:32:15 -07:00
Tao Bao
19c17b101e
Merge "Remove res-560dpi symlink." am: 02986d381e
...
am: 75dd6f652d
Change-Id: I5df14b63a50b1f2baa8c3442c89e5e47c038b8fa
2018-09-06 13:05:50 -07:00
Tao Bao
75dd6f652d
Merge "Remove res-560dpi symlink."
...
am: 02986d381e
Change-Id: I4342fb3dcb5e50be1996b06d1eaf6aa50afc3a00
2018-09-06 12:58:09 -07:00
Tao Bao
02986d381e
Merge "Remove res-560dpi symlink."
2018-09-06 19:29:37 +00:00
Tao Bao
52b6ecab37
Remove res-560dpi symlink.
...
The change to platform/build in [1] added support for mapping numeric
DPIs to a proper density bucket. As a result, 560dpi gets mapped to
xxxhdpi automatically. This CL removes the previous workaround.
[1] https://android-review.googlesource.com/c/platform/build/+/741666
Bug: 111559919
Test: Build recovery image for marlin. Verify that it picks up xxxhdpi
recovery resources.
Test: Boot into recovery. Run graphics test.
Change-Id: I65fefc7e2ba90b347e0ad283139429266d77c3b4
2018-09-05 21:55:25 -07:00
Tao Bao
884b1a5b0c
Merge "support mounting f2fs in recovery mode" am: a062fae9d7 am: 15e957d3f6
...
am: 6b4a2c4553
Change-Id: I0276732b6acd77541172d612587abba9222ab484
2018-09-04 10:40:53 -07:00
Tao Bao
6b4a2c4553
Merge "support mounting f2fs in recovery mode" am: a062fae9d7
...
am: 15e957d3f6
Change-Id: I53bd70ae87fc69ae82dfbefe48fa42d60ef438eb
2018-09-04 10:28:45 -07:00
Tao Bao
15e957d3f6
Merge "support mounting f2fs in recovery mode"
...
am: a062fae9d7
Change-Id: I5f9798c1d901e98240831297aadadf39158cf2fc
2018-09-04 10:19:35 -07:00
Tao Bao
a062fae9d7
Merge "support mounting f2fs in recovery mode"
2018-09-04 16:59:39 +00:00
Lianjun Huang
5d7be6b4a5
support mounting f2fs in recovery mode
...
Change-Id: Ic03b3e95c4b5cd49b92cb3ec697e327a59421549
Signed-off-by: Lianjun Huang <huanglianjun@vivo.com >
2018-09-03 15:37:00 +00:00
Tao Bao
4ca55f202e
Merge "applypatch: {Load,Save}FileContents return bool values." am: bae5f1a846 am: baa841ed04
...
am: 15651fd8f0
Change-Id: I75f199f8bcbc027b09c20d47bad41f2813f705c1
2018-09-01 09:28:35 -07:00
Tao Bao
15651fd8f0
Merge "applypatch: {Load,Save}FileContents return bool values." am: bae5f1a846
...
am: baa841ed04
Change-Id: Id2f21c231c57001b10d48472eea33d7d15ed8631
2018-09-01 09:24:14 -07:00
Tao Bao
baa841ed04
Merge "applypatch: {Load,Save}FileContents return bool values."
...
am: bae5f1a846
Change-Id: I1ee905f0182adb92d25208ba06a847afaf1835ba
2018-09-01 09:19:52 -07:00
Tao Bao
bae5f1a846
Merge "applypatch: {Load,Save}FileContents return bool values."
2018-09-01 16:09:02 +00:00
Tao Bao
44b4a562b7
Merge "applypatch: Refactor applypatch()." am: af522672a2 am: 37521a9623
...
am: 7c83c139d6
Change-Id: I760b5159cc7bbe1ee5785447fbebb6650408e020
2018-08-31 14:47:35 -07:00
Tao Bao
7c83c139d6
Merge "applypatch: Refactor applypatch()." am: af522672a2
...
am: 37521a9623
Change-Id: Ib678a1af32e8d6a0d68672099ccf06b088780541
2018-08-31 14:43:03 -07:00
Tao Bao
37521a9623
Merge "applypatch: Refactor applypatch()."
...
am: af522672a2
Change-Id: Ia6e953937e1d23f165b51ca759568efb53e9c9db
2018-08-31 14:38:29 -07:00
Tao Bao
09e8493861
applypatch: {Load,Save}FileContents return bool values.
...
Bug: 110106408
Test: Run recovery_unit_test and recovery_component_test on marlin.
Change-Id: Id72e24dd00eb451565d90cff6e049f4f4b844ea2
2018-08-31 14:31:19 -07:00
Tao Bao
af522672a2
Merge "applypatch: Refactor applypatch()."
2018-08-31 21:24:31 +00:00
Tao Bao
5609bc8b34
applypatch: Refactor applypatch().
...
applypatch() was initially designed for file-based OTA, operating on
individual files. It was later extended to allow patching eMMC targets
as a whole, in favor of block-based updates.
As we have deprecated file-based OTA since Oreo, part of the code in
applypatch() has become obsolete. This CL refactors the related
functions, by removing the obsolete logic and focusing on eMMC targets.
Since this CL substantially changes applypatch APIs, it adds new
functions to avoid unintentionally mixing them together. In particular,
it removes `applypatch()`, `applypatch_check()`, `applypatch_flash()`,
and adds `PatchPartition()`, `PatchPartitionCheck()`, `FlashPartition()`
and `CheckPartition()`. It also replaces the old Edify functions
`apply_patch()` and `apply_patch_check()` with `patch_partition()` and
`patch_partition_check()` respectively.
This CL requires matching changes to OTA generation script (in the same
topic).
Bug: 110106408
Test: Run recovery_unit_test and recovery_component_test on marlin.
Test: `m dist` with non-A/B target. Verify
/system/bin/install-recovery.sh on device.
Test: `m dist` with non-A/B target using BOARD_USES_FULL_RECOVERY_IMAGE.
Verify /system/bin/install-recovery.sh on device.
Test: Install an incremental OTA with the new updater and scripts.
Change-Id: Ia34a90114bb227f4216eb478c22dc98c8194cb7f
2018-08-31 09:21:15 -07:00
Tao Bao
71656da7c0
Merge "Enable c++17 in recovery_defaults." am: 6a333cde10 am: 287881d558
...
am: dfc4268a07
Change-Id: I46381125e958e46c042ef07584cbf1f947ccb74e
2018-08-28 13:42:46 -07:00
Tao Bao
dfc4268a07
Merge "Enable c++17 in recovery_defaults." am: 6a333cde10
...
am: 287881d558
Change-Id: I8763bd099f4a464db3933c193fda651303443cc9
2018-08-28 13:25:28 -07:00
Tao Bao
287881d558
Merge "Enable c++17 in recovery_defaults."
...
am: 6a333cde10
Change-Id: Iec615e16f9a3b9b18297c4ee5376d5ee0baa830d
2018-08-28 13:19:27 -07:00
Tao Bao
6a333cde10
Merge "Enable c++17 in recovery_defaults."
2018-08-28 20:07:09 +00:00
Tao Bao
43bfa6e429
Enable c++17 in recovery_defaults.
...
And add the first few users.
Test: Run recovery_unit_test and recovery_component_test on marlin.
Change-Id: Ifdf093d011478b6a1dd0405b0ba48c145b509cc8
2018-08-28 10:49:07 -07:00
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
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