commit a81a5ed0d7d8560be6e4360640b9584975e7d640
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 23 02:00:40 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 23 02:00:41 2017 +0000
tree 54da6eec948e1c6a1b5cd4b793fb309fdbe2c855
parent 6a1a12fa16b7c34a130f393ef9923bf67fc02c3a
parent ca16472d284bd0724d1a2f4c76976ee248428b86

Merge "assemble_vintf: adding avb.vbmeta-version into framework compatiblity matrix" into oc-dr1-dev

assemble_vintf.cpp

diff --git a/assemble_vintf.cpp b/assemble_vintf.cpp
index 62d65b0..05801eb 100644
--- a/assemble_vintf.cpp
+++ b/assemble_vintf.cpp
@@ -118,6 +118,12 @@
             }
             matrix->framework.mSepolicy =
                 Sepolicy(kernelSepolicyVers, {{sepolicyVers.majorVer, sepolicyVers.minorVer}});
+
+            Version avbMetaVersion;
+            if (!getFlag("FRAMEWORK_VBMETA_VERSION", &avbMetaVersion)) {
+                return false;
+            }
+            matrix->framework.mAvbMetaVersion = avbMetaVersion;
         }
         out() << gCompatibilityMatrixConverter(*matrix);
         out().flush();