summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2017-07-06 14:50:29 -0500
committerYifan Hong2017-07-12 00:59:43 -0500
commit7f6c00c77c755f4efef49e5371058470a461193f (patch)
tree5685d6a92bafefadad076e14f371cff8d1b1b908
parent02e94004a6d35d20af7df1ea9c66c5b65e4bd9c6 (diff)
downloadplatform-system-libvintf-7f6c00c77c755f4efef49e5371058470a461193f.tar.gz
platform-system-libvintf-7f6c00c77c755f4efef49e5371058470a461193f.tar.xz
platform-system-libvintf-7f6c00c77c755f4efef49e5371058470a461193f.zip
Revert "Revert "assemble_vintf: adding avb.vbmeta-version into framework compatiblity matrix""
This reverts commit 823b9a2ab6d0e947add01e2d285bd9b277084f56. Bug: 38325029 Test: builds (assemble_vintf is used only at build time) Change-Id: I306fd92e843e6125d953f9db2604a9f06381b086
-rw-r--r--assemble_vintf.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/assemble_vintf.cpp b/assemble_vintf.cpp
index 2752078..98fdae3 100644
--- a/assemble_vintf.cpp
+++ b/assemble_vintf.cpp
@@ -171,6 +171,12 @@ public:
171 } 171 }
172 matrix->framework.mSepolicy = 172 matrix->framework.mSepolicy =
173 Sepolicy(kernelSepolicyVers, {{sepolicyVers.majorVer, sepolicyVers.minorVer}}); 173 Sepolicy(kernelSepolicyVers, {{sepolicyVers.majorVer, sepolicyVers.minorVer}});
174
175 Version avbMetaVersion;
176 if (!getFlag("FRAMEWORK_VBMETA_VERSION", &avbMetaVersion)) {
177 return false;
178 }
179 matrix->framework.mAvbMetaVersion = avbMetaVersion;
174 } 180 }
175 out() << gCompatibilityMatrixConverter(*matrix); 181 out() << gCompatibilityMatrixConverter(*matrix);
176 out().flush(); 182 out().flush();