commit 5dc8bd364cea875518fc01606ae8ba5f776cb735
author android-build-team Robot <android-build-team-robot@google.com> Sun Jun 25 07:29:48 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Jun 25 07:29:48 2017 +0000
tree 54da6eec948e1c6a1b5cd4b793fb309fdbe2c855
parent 9fa9fc5d722951b1be1953d04c2ed8be1b8f9932
parent a81a5ed0d7d8560be6e4360640b9584975e7d640

release-request-c5216b17-dc50-4b24-831c-dc696ed657cc-for-git_oc-dr1-release-4133426 snap-temp-L83500000077479774

Change-Id: Ia08a98d9e28dd3cdd81b8dc34f9ac9334e572930

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();