commit 881a9e45aa1666dd0ef105e92cab5f73c1eb6f1e
author Yifan Hong <elsk@google.com> Thu Apr 27 19:31:13 2017 -0700
committer Yifan Hong <elsk@google.com> Fri Apr 28 11:09:09 2017 -0700
tree 67a51e3aaf9f6f7a93fa0669b9904862b941c4d0
parent 242eabff291dcd9f6213e250263aa4da6eead2f7

Renamed avb version variables in RuntimeInfo.

Old variable names are confusing.

Test: pass
Change-Id: I21d43b0615f52443fcda8c067507d2d7207ec3e7

test/main.cpp

diff --git a/test/main.cpp b/test/main.cpp
index b5b6b18..1c7c88d 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -62,9 +62,9 @@
         cm.device.mVndk.mVersionRange = range;
         cm.device.mVndk.mLibraries = libs;
     }
-    void setAvb(RuntimeInfo &ki, Version initVersion, Version bootVersion) {
-        ki.mAvbInitVersion = initVersion;
-        ki.mAvbBootVersion = bootVersion;
+    void setAvb(RuntimeInfo &ki, Version vbmeta, Version boot) {
+        ki.mBootVbmetaAvbVersion = vbmeta;
+        ki.mBootAvbVersion = boot;
     }
     void setAvb(CompatibilityMatrix &cm, Version &&avbVersion) {
         cm.framework.mAvbMetaVersion = avbVersion;
@@ -148,7 +148,7 @@
             {"CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES", "\"\""},
             {"CONFIG_ILLEGAL_POINTER_VALUE", "0xdead000000000000"}
         };
-        info.mAvbBootVersion = info.mAvbInitVersion = {2, 1};
+        setAvb(info, {2, 1}, {2, 1});
         return info;
     }
 };