Commit Graph

7780 Commits

Author SHA1 Message Date
Tao Bao
8ab684adca Merge "Add misc_writer." am: 962f7e0c0c am: f9fb4878fc
am: 70bc3c40d2

Change-Id: I505ef030e614eda2bac7f8baa12acc92b22e9142
2019-05-21 07:01:33 -07:00
Tao Bao
70bc3c40d2 Merge "Add misc_writer." am: 962f7e0c0c
am: f9fb4878fc

Change-Id: Icb9af8d6b74a958b0979e4d53426e3f9eaf01e50
2019-05-21 06:56:31 -07:00
Tao Bao
f9fb4878fc Merge "Add misc_writer."
am: 962f7e0c0c

Change-Id: I5b007e3c880c7f6100e95c57ee02b2fd8e3d6c6d
2019-05-21 06:51:28 -07:00
Tao Bao
962f7e0c0c Merge "Add misc_writer." 2019-05-21 13:41:07 +00:00
Tao Bao
7ae0169842 Add misc_writer.
bootloader_message.h currently divides /misc into four segments. The
space between 2K and 16K is reserved for vendor use (e.g. bootloader
persists flags). This CL adds a vendor tool "misc_writer", to allow
writing data to the vendor space in /misc, before getting a dedicated
HAL for accessing /misc partition (b/131775112).

Targets need to explicitly include the module, then invoke the
executable to write data. For example, the following command will write
3-byte data ("0xABCDEF") to offset 4 in vendor space (i.e. 2048 + 4 in
/misc).
$ /vendor/bin/misc_writer --vendor-space-offset 4 --hex-string 0xABCDEF

Bug: 132906936
Test: Run recovery_unit_test on crosshatch.
Test: Call the command via init.hardware.rc on crosshatch. Check that
      the call finishes successfully. Then check the contents written to
      /misc (`dd bs=1 skip=2048 if=/dev/block/sda2 count=32 | xxd`).
Change-Id: I79548fc63fc79b705a0320868690569c3106949f
2019-05-20 15:51:26 -07:00
Xin Li
619f571114 [automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master am: e7a0262c14 -s ours
am: ec3d4af4b6

Change-Id: I1c3e43d0ee3120a84c068ec35447db3e73cb7a0e
2019-05-16 02:24:20 -07:00
Xin Li
ec3d4af4b6 [automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master
am: e7a0262c14 -s ours
am skip reason: subject contains skip directive

Change-Id: I8100929a2f3a752875be6ef98080174c7fb68dae
2019-05-15 17:25:30 -07:00
Xin Li
e7a0262c14 DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master
Bug: 132622481
Change-Id: Ic07faa9aa968d11ae8f6b44d548d724fd194e047
2019-05-13 15:56:57 -07:00
Tao Bao
fb4f72cb7c Merge "roots: Remove get_system_root and logical_partitions_mapped." am: ba8f38d741
am: c53856dca7

Change-Id: Ia77b93802de465219587a519d1109aab888c38f0
2019-05-10 18:08:37 -07:00
Tao Bao
c53856dca7 Merge "roots: Remove get_system_root and logical_partitions_mapped."
am: ba8f38d741

Change-Id: I7bc0a5ff9e7709f91fe28f4c9b8d20f5c8d20cf8
2019-05-10 17:40:31 -07:00
Tao Bao
ba8f38d741 Merge "roots: Remove get_system_root and logical_partitions_mapped." 2019-05-10 23:58:32 +00:00
Tao Bao
f90d9a102f roots: Remove get_system_root and logical_partitions_mapped.
Test: TreeHugger
Test: Boot into recovery on blueline. Choose "Mount system partition".
Change-Id: Iac475d18ce2415de09dc0bf009ad4cf0383ffede
2019-05-10 10:42:56 -07:00
Xin Li
4904e5f06a [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 343a7dcdd2 -s ours
am: 8e7be1faeb -s ours
am skip reason: subject contains skip directive

Change-Id: I3c51185cacadca80cfa183ec16b73426c7b9e936
2019-05-09 17:11:52 -07:00
Elliott Hughes
774a79492a Merge "Track libziparchive API change." am: 6da27adb0b
am: 46fa74623a

Change-Id: I1108099bc7dc4f20856fb611eb2552592ceff759
2019-05-09 16:18:32 -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
Xin Li
8e7be1faeb [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
am: 343a7dcdd2 -s ours
am skip reason: subject contains skip directive

Change-Id: Iea7679752ae74ce0d026fe3e58d3d3df88b21739
2019-05-09 15:48:46 -07:00
Xin Li
343a7dcdd2 Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." 2019-05-09 22:05:46 +00:00
Elliott Hughes
46fa74623a Merge "Track libziparchive API change."
am: 6da27adb0b

Change-Id: Ib261d224fe4b57ead972987466dc30411505aa30
2019-05-09 14:46:26 -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
Elliott Hughes
6da27adb0b Merge "Track libziparchive API change." 2019-05-09 21:32:52 +00: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
Xin Li
a5741b06ef DO NOT MERGE - Merge Pie Bonito/Sargo into master.
Bug: 131756210
Change-Id: Ia8a170576e6473ec4dae90d481e17aa216223e97
2019-05-09 09:27:02 -07: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
143a03fa03 Track libziparchive API change.
Bug: http://b/129068177
Test: treehugger
Change-Id: I618bbcf38914dd81e042e0cfd1976ff26274dc30
2019-05-08 17:28:22 -07:00
android-build-team Robot
94baa21254 Snap for 5450365 from bd8ed91d04 to pi-platform-release
Change-Id: I02180574c059ce8af1f031195ee497540a82cd65
2019-05-07 21:57:33 +00: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
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
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
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
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
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