summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2017-07-12 17:51:28 -0500
committerandroid-build-merger2017-07-12 17:51:28 -0500
commitfe538e86bca37653c85cd7a58f3ee06688e9bc6b (patch)
tree5685d6a92bafefadad076e14f371cff8d1b1b908
parent93368447cae82ea0d4788706f31cb4b14a526f6b (diff)
parent7f6c00c77c755f4efef49e5371058470a461193f (diff)
downloadplatform-system-libvintf-fe538e86bca37653c85cd7a58f3ee06688e9bc6b.tar.gz
platform-system-libvintf-fe538e86bca37653c85cd7a58f3ee06688e9bc6b.tar.xz
platform-system-libvintf-fe538e86bca37653c85cd7a58f3ee06688e9bc6b.zip
Revert "Revert "assemble_vintf: adding avb.vbmeta-version into framework compatiblity matrix""
am: 7f6c00c77c Change-Id: Ic2350f7062979cadf165136725e193d6eb341be8
-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();