Commit Graph

7806 Commits

Author SHA1 Message Date
Tianjie Xu 4161a635ce Merge "Skip hashtree computation during block image verify" am: c046a61d97 am: e945763a5d
am: 8876c2d4ab

Change-Id: I3647cd9b5d6e15473778ce3ac7e8c525f8e58ebc
2019-05-09 17:45:33 -07:00
Tianjie Xu 8876c2d4ab Merge "Skip hashtree computation during block image verify" am: c046a61d97
am: e945763a5d

Change-Id: Ic732927e67fee9abab74e9ca2df2bbf271228c9e
2019-05-09 16:15:36 -07:00
Tianjie Xu e945763a5d Merge "Skip hashtree computation during block image verify"
am: c046a61d97

Change-Id: If5934f92768248c79029c3e7e0934b7a2a37c88d
2019-05-09 14:43:49 -07:00
Tianjie Xu cac54eaba5 Merge "Add Updater class and remove UpdaterInfo" am: 19737a5b38 am: 93667742fe
am: 58c716601e

Change-Id: Ic38dfed8c169516bc0f30acbdf9971b683fea044
2019-05-09 14:06:16 -07:00
Tianjie Xu c046a61d97 Merge "Skip hashtree computation during block image verify" 2019-05-09 20:47:57 +00:00
Tianjie Xu 58c716601e Merge "Add Updater class and remove UpdaterInfo" am: 19737a5b38
am: 93667742fe

Change-Id: I80f09705d083e4566ec4b60ebcf0ef711fe48845
2019-05-09 11:08:05 -07:00
Tianjie Xu 3fda5d6508 Skip hashtree computation during block image verify
The hashtree computation is designed to execute after we write all the
bytes to the target block device. And executing the command during block
image verify will almost always fail since we are still on the source
build.

Test: run simulator
Change-Id: If8ebb66739969520367a0815f5f8f89f6fae47cf
2019-05-09 10:58:10 -07:00
Tianjie Xu 93667742fe Merge "Add Updater class and remove UpdaterInfo"
am: 19737a5b38

Change-Id: If5ec40a583441f54b6bb012cd9f501f14d4f3b86
2019-05-09 10:51:05 -07:00
Tianjie Xu 19737a5b38 Merge "Add Updater class and remove UpdaterInfo" 2019-05-09 17:33:52 +00:00
Tianjie Xu 58d59129e1 Add Updater class and remove UpdaterInfo
The UpdaterInfo class is merely a collection of pointers and POD types.
We can replace it with a Updater class that has the ownership of the
resources. This also makes this class extensible as we plan to add more
functionality in the host simulator.

Bug: 131911365
Test: unit tests pass, run an update on cuttlefish and check last_install
Change-Id: I07ca5963bbee8ae3cb85ccc184464910aa73d4e4
2019-05-08 23:07:04 -07:00
Elliott Hughes 61600225e9 Merge "Track libziparchive API change." am: 9423d2f6b7 am: 0d24715223
am: e76cedf588

Change-Id: Iac7ddaa02c98be75151a87a613688c3f456e2ffa
2019-05-06 19:18:03 -07:00
Elliott Hughes e76cedf588 Merge "Track libziparchive API change." am: 9423d2f6b7
am: 0d24715223

Change-Id: I1aabd53cfe7a42773d22a6192f89340261d29ff3
2019-05-06 17:39:33 -07:00
Elliott Hughes 0d24715223 Merge "Track libziparchive API change."
am: 9423d2f6b7

Change-Id: I611e235693bd7b060f472280f94e89e2f52a2ea0
2019-05-06 17:14:06 -07:00
Elliott Hughes 9423d2f6b7 Merge "Track libziparchive API change." 2019-05-06 23:45:16 +00:00
Colin Cross a0bad4d22f Merge "Disable libbootloader_message for darwin" am: 12262d568a am: 5a25636f34
am: b0270e043a

Change-Id: I288c4b0a18275e83f4cc0fbe4997252eb595e273
2019-05-06 14:35:11 -07:00
Colin Cross b0270e043a Merge "Disable libbootloader_message for darwin" am: 12262d568a
am: 5a25636f34

Change-Id: I5c3052596556bb4ba79cc2382114f1d117de1109
2019-05-06 14:30:07 -07:00
Colin Cross 5a25636f34 Merge "Disable libbootloader_message for darwin"
am: 12262d568a

Change-Id: Ic3016f69893c4f5792f30be1edf341e6d6338297
2019-05-06 14:25:08 -07:00
Treehugger Robot 12262d568a Merge "Disable libbootloader_message for darwin" 2019-05-06 21:09:10 +00:00
Elliott Hughes a86dddbfa5 Track libziparchive API change.
Bug: http://b/129068177
Test: treehugger
Change-Id: Ie5b2b0cff087f2e9e65a4e77c187e3173357f3ad
2019-05-06 10:28:14 -07:00
Colin Cross fb68d38fba Disable libbootloader_message for darwin
libfstab is not built for darwin, don't build libbootloader_message
either.

Bug: 131709594
Test: m PRODUCT-sdk-sdk sdk_repo
Change-Id: I6e3b04f1c3e97d5aa6ac0452bf13e714f8dae437
2019-05-06 09:49:00 -07:00
Bill Yi daa2fc4723 [automerger skipped] Import translations. DO NOT MERGE am: 9681eef5ff -s ours
am: 1a8b3cab32 -s ours
am skip reason: subject contains skip directive

Change-Id: I7cb5d68cd9707958dbcf004e77e71445cd61a982
2019-05-04 20:21:07 -07:00
Bill Yi 1a8b3cab32 [automerger skipped] Import translations. DO NOT MERGE
am: 9681eef5ff -s ours
am skip reason: subject contains skip directive

Change-Id: Ifa001d4bfc18d81cf3da5b85d12fcccdf542a206
2019-05-04 20:15:02 -07:00
Bill Yi 9681eef5ff Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I4933222253f1bde2daab4726be971c6d7008a0e4
2019-05-04 18:39:11 -07:00
Elliott Hughes 3d3c98f5b2 Merge "ConsumePrefix is now in libbase." am: b699b4b1cd am: 24566cebf5
am: dec987d3da

Change-Id: Ibf9650167fd8f73bfef12b113f7b057e543a51ea
2019-05-03 21:10:57 -07:00
Elliott Hughes dec987d3da Merge "ConsumePrefix is now in libbase." am: b699b4b1cd
am: 24566cebf5

Change-Id: I31f48c68a1d55b11d7e4726ab437b4fc79ecd3b5
2019-05-03 17:48:58 -07:00
Elliott Hughes 24566cebf5 Merge "ConsumePrefix is now in libbase."
am: b699b4b1cd

Change-Id: I03b337a921882fa0c06744fb903b8e06c385f9d9
2019-05-03 17:43:25 -07:00
Elliott Hughes b699b4b1cd Merge "ConsumePrefix is now in libbase." 2019-05-04 00:03:14 +00:00
Yifan Hong 2b065d80da Merge changes from topic "cuttlefish_misc" am: be25cd21e4 am: d3916e2f1f
am: 3965f65658

Change-Id: I2ceb221115c5e823c3ad137e34fe279a54308bc5
2019-05-03 13:22:03 -07:00
Elliott Hughes 93838f6e42 ConsumePrefix is now in libbase.
Test: treehugger
Change-Id: I2feecabb77986d3e007de1009b123c2d98454631
2019-05-03 10:33:04 -07:00
Yifan Hong 3965f65658 Merge changes from topic "cuttlefish_misc" am: be25cd21e4
am: d3916e2f1f

Change-Id: Ib4c168e8bcef0d3e390bb1aa17a0d18989fd6203
2019-05-03 09:44:25 -07:00
Yifan Hong d3916e2f1f Merge changes from topic "cuttlefish_misc"
am: be25cd21e4

Change-Id: I9f4cdb1a67c9eae1b1d55d56f40887d686b39644
2019-05-03 09:39:25 -07:00
Treehugger Robot be25cd21e4 Merge changes from topic "cuttlefish_misc"
* changes:
  libbootloader_message: host_supported.
  libbootloader_message: write recovery to any device
2019-05-03 16:09:27 +00:00
Tianjie Xu ae1594e4eb Merge "Implement FuseBlockDataProvider" am: bfd6cf59dc am: 15a899363e
am: 84f6a330a0

Change-Id: Ic63daab1f6a51d3a97e65a57ce516d1204b928cd
2019-05-02 20:16:15 -07:00
Tianjie Xu 84f6a330a0 Merge "Implement FuseBlockDataProvider" am: bfd6cf59dc
am: 15a899363e

Change-Id: I58a37b32ce5217c968471c8095d357ca5f4061b7
2019-05-02 18:50:53 -07:00
Tianjie Xu 15a899363e Merge "Implement FuseBlockDataProvider"
am: bfd6cf59dc

Change-Id: I6dd3d4d9cae5597dbaa3e880f0cbcc2e46e98809
2019-05-02 18:30:42 -07:00
Tianjie Xu bfd6cf59dc Merge "Implement FuseBlockDataProvider" 2019-05-03 00:35:58 +00:00
Yifan Hong d83070ddb9 libbootloader_message: host_supported.
Also, strlcat is not available on host, so use
std::string::operator+= instead.

Test: cuttlefish
Bug: 79094284

Change-Id: I1e69daeb522ca73f43e0c4855cf099a021ed4d47
2019-05-02 15:51:56 -07:00
Yifan Hong c784ce50e8 libbootloader_message: write recovery to any device
Test: cuttlefish
Bug: 79094284

Change-Id: If1a6460a8cbed2e2d22fa9e16e6d7ca84f4592d0
2019-05-02 15:50:15 -07:00
xunchang 311e6ca7b6 Implement FuseBlockDataProvider
Adds a fuse data provider that parses the metadata from a block map,
reads the data from the given ranges of the block device; and provides
the data to the fuse.

Bug: 127071893
Test: unit tests pass, install a package from block map
Change-Id: Ie9925ee9144e98642505b3f5e1a4a186d2b21ed0
2019-05-01 12:09:38 -07:00
Tao Bao 414051a966 Merge changes I2d42f55a,Ic1b5dbf7 am: b5fe2dd00c am: 2ea4768d6e
am: e545dcf7c7

Change-Id: I4cb9f031fd90470ad03f277d8a4f7588c90fb528
2019-04-30 19:30:29 -07:00
xunchang 52c7b69182 Support wipe command in rescue mode am: 5a1916b9be
am: 0b64a17614

Change-Id: Ica162fbbc208552bd6fd93c055575c018add5253
2019-04-30 17:28:20 -07:00
Tao Bao e545dcf7c7 Merge changes I2d42f55a,Ic1b5dbf7 am: b5fe2dd00c
am: 2ea4768d6e

Change-Id: I501ab5e9041ab6984e7d597c9534e6867742698c
2019-04-30 15:42:23 -07:00
Tao Bao 2ea4768d6e Merge changes I2d42f55a,Ic1b5dbf7
am: b5fe2dd00c

Change-Id: I253e8f580cfa41a6a240cb311970a3165fd69fb0
2019-04-30 15:36:27 -07:00
Tao Bao b5fe2dd00c Merge changes I2d42f55a,Ic1b5dbf7
* changes:
  install: Install functions return InstallResult.
  install: Return bool for a few check functions.
2019-04-30 21:49:03 +00:00
Tao Bao adc99efd1c install: Install functions return InstallResult.
Test: `atest recovery_unit_test recovery_component_test`
Test: Sideload a package on taimen.
Change-Id: I2d42f55a89931ee495ea5c5d9e6b5ee1058e8e52
2019-04-30 13:58:03 -07:00
Tao Bao 36c7276cb2 install: Return bool for a few check functions.
The results from these functions have boolean semantics. They're
returning `int` prior to this CL, with some of them mixing 0 and
InstallResult.  Note that SetUpNonAbUpdateCommands() was returning
INSTALL_CORRUPT / INSTALL_ERROR / 0 prior to this change, but all the
callers handle INSTALL_CORRUPT and INSTALL_ERROR the same way.

This CL changes them to return bool instead.

Test: `mmma -j bootable/recovery`
Test: TreeHugger
Test: Sideload on taimen.
Change-Id: Ic1b5dbf79aaca68b53ab8ea2c8ba3d19f988c571
2019-04-30 13:58:03 -07:00
xunchang 0b64a17614 Support wipe command in rescue mode
am: 5a1916b9be

Change-Id: I7683fe5986cc5c82c431e8e8431a7bb02ea36682
2019-04-30 13:10:46 -07:00
Tao Bao dd2076e383 Merge "tests: Merge recovery_component_test into recovery_unit_test." am: 865d1df0c9 am: 064ce341ee
am: 9df721ed91

Change-Id: Ic01383ba041a3f831ac7c6c31413742587d78de9
2019-04-30 13:09:20 -07:00
Tao Bao 9df721ed91 Merge "tests: Merge recovery_component_test into recovery_unit_test." am: 865d1df0c9
am: 064ce341ee

Change-Id: I7941b9a42796bfd6404ad02fd15354c94ca4439c
2019-04-30 12:35:15 -07:00
Tao Bao 064ce341ee Merge "tests: Merge recovery_component_test into recovery_unit_test."
am: 865d1df0c9

Change-Id: I39fe185e72acd6eb934db6868df1526fdfc1614c
2019-04-30 12:30:22 -07:00