Merge "Rename vbmeta_mainline to vbmeta_system." am: 6c009aad3f am: c5925cca25android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release

am: 5fb989d150

Change-Id: Idb3ecc25ba2529e62680a677b7073261797e429f

1 files changed, 9 insertions, 9 deletions

diff --git a/README.md b/README.md
index ad1e79f..fbee3f5 100644
--- a/README.md
+++ b/README.md
@@ -591,25 +591,25 @@ the [Device Specific Notes](#Device-Specific-Notes) section for details.
 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