commit f4135016f2c735ac1bf3c50730bb66aa2b8e385f
author Yifan Hong <elsk@google.com> Mon Dec 18 17:27:19 2017 -0800
committer Yifan Hong <elsk@google.com> Wed Jan 10 15:17:52 2018 -0800
tree a510b171c1c00407169945b890c135605d06f4a2
parent ffcaf994fe9956e976d4c525038f39fa08e76e8a

assemble_vintf: warn for missing env var for fwk_cm.empty.xml

Silence the warning when building fwk_cm.xml, because
values will come from fwk_cm.empty.xml.

Test: libvintf_test
Bug: 69636193
Change-Id: I705bd892681cd04f62d8aa7175276a9854b73883

AssembleVintf.cpp

diff --git a/AssembleVintf.cpp b/AssembleVintf.cpp
index 8807da0..d2a0b8f 100644
--- a/AssembleVintf.cpp
+++ b/AssembleVintf.cpp
@@ -411,8 +411,6 @@
     bool assembleCompatibilityMatrix(CompatibilityMatrices* matrices) {
         std::string error;
         CompatibilityMatrix* matrix = nullptr;
-        KernelSepolicyVersion kernelSepolicyVers;
-        Version sepolicyVers;
         std::unique_ptr<HalManifest> checkManifest;
         if (matrices->front().object.mType == SchemaType::DEVICE) {
             matrix = &matrices->front().object;
@@ -447,25 +445,21 @@
                 }
             }
 
-            if (!getFlag("BOARD_SEPOLICY_VERS", &sepolicyVers)) {
-                return false;
-            }
-            if (!getFlag("POLICYVERS", &kernelSepolicyVers)) {
-                return false;
-            }
-
             if (!assembleFrameworkCompatibilityMatrixKernels(matrix)) {
                 return false;
             }
 
-            matrix->framework.mSepolicy =
-                Sepolicy(kernelSepolicyVers, {{sepolicyVers.majorVer, sepolicyVers.minorVer}});
-
-            Version avbMetaVersion;
-            if (!getFlag("FRAMEWORK_VBMETA_VERSION", &avbMetaVersion)) {
-                return false;
+            // set sepolicy.sepolicy-version to BOARD_SEPOLICY_VERS when none is specified.
+            std::vector<VersionRange>* sepolicyVrs =
+                &matrix->framework.mSepolicy.mSepolicyVersionRanges;
+            VersionRange sepolicyVr;
+            if (!sepolicyVrs->empty()) sepolicyVr = sepolicyVrs->front();
+            if (getFlagIfUnset("BOARD_SEPOLICY_VERS", &sepolicyVr)) {
+                *sepolicyVrs = {{sepolicyVr}};
             }
-            matrix->framework.mAvbMetaVersion = avbMetaVersion;
+
+            getFlagIfUnset("POLICYVERS", &matrix->framework.mSepolicy.mKernelSepolicyVersion);
+            getFlagIfUnset("FRAMEWORK_VBMETA_VERSION", &matrix->framework.mAvbMetaVersion);
 
             out() << "<!--" << std::endl;
             out() << "    Input:" << std::endl;