Snap for 5374457 from 119251268c594d115a1eff31b3ec32108b88b593 to qt-release
Change-Id: If57110f11eedd7142b5626b5ff8fe1f8979a2ad3
diff --git a/README.md b/README.md
index ad1e79f..fbee3f5 100644
--- a/README.md
+++ b/README.md
@@ -591,25 +591,25 @@
Devices can be configured to create additional `vbmeta` partitions as
[chained partitions](#The-VBMeta-struct) in order to update a subset of
partitions without changing the top-level `vbmeta` partition. For example,
-the following variables create `vbmeta_mainline.img` as a chained `vbmeta`
+the following variables create `vbmeta_system.img` as a chained `vbmeta`
image that contains the hash-tree descriptors for `system.img` and
-`product_services.img`. `vbmeta_mainline.img` itself will be signed by the
+`product_services.img`. `vbmeta_system.img` itself will be signed by the
specified key and algorithm.
- BOARD_AVB_VBMETA_MAINLINE := system product_services
- BOARD_AVB_VBMETA_MAINLINE_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
- BOARD_AVB_VBMETA_MAINLINE_ALGORITHM := SHA256_RSA2048
- BOARD_AVB_VBMETA_MAINLINE_ROLLBACK_INDEX_LOCATION := 1
+ BOARD_AVB_VBMETA_SYSTEM := system product_services
+ BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
+ BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
+ BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
Note that the hash-tree descriptors for `system.img` and
-`product_services.img` will be included only in `vbmeta_mainline.img`, but
+`product_services.img` will be included only in `vbmeta_system.img`, but
not `vbmeta.img`. With the above setup, partitions `system.img`,
-`product_services.img` and `vbmeta_mainline.img` can be updated
+`product_services.img` and `vbmeta_system.img` can be updated
independently - but as a group - of the rest of the partitions, *or* as
part of the traditional updates that update all the partitions.
Currently build system supports building chained `vbmeta` images of
-`vbmeta_mainline.img` (`BOARD_AVB_VBMETA_MAINLINE`) and `vbmeta_vendor.img`
+`vbmeta_system.img` (`BOARD_AVB_VBMETA_SYSTEM`) and `vbmeta_vendor.img`
(`BOARD_AVB_VBMETA_VENDOR`).
To prevent rollback attacks, the rollback index should be increased on