commit 588955a06e16a8473fd3efbd79e9bd1ee806f20c
author Yifan Hong <elsk@google.com> Thu May 03 18:00:47 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 03 18:00:47 2018 +0000
tree 86406b80f1c482479ae4ada8b184c4ef6d5aeea2
parent eea41348e1439a3832f21892b9e051aec67ff9a5
parent 49b213e917517072b1326571a0aa59df5e491e90

Merge changes from topic "lshal_fqname"

* changes:
  Add HalManifest::insertInstance
  Remove unused ManfiestHal::insertLegacyInstance
  Add ManifestHal::insertInstance
  Add more types to MapValueIterator.
  Add TransportArch constructors.

AssembleVintf.cpp

diff --git a/AssembleVintf.cpp b/AssembleVintf.cpp
index 575e598..1153f47 100644
--- a/AssembleVintf.cpp
+++ b/AssembleVintf.cpp
@@ -331,6 +331,7 @@
                 }
             }
 
+            // TODO(b/78943004): add everything
             if (!halManifest->addAllHals(&halToAdd, &error)) {
                 std::cerr << "File \"" << path << "\" cannot be added: conflict on HAL \"" << error
                           << "\" with an existing HAL. See <hal> with the same name "
@@ -341,9 +342,8 @@
         }
 
         if (halManifest->mType == SchemaType::DEVICE) {
-            if (!getFlag("BOARD_SEPOLICY_VERS", &halManifest->device.mSepolicyVersion)) {
-                return false;
-            }
+            (void)getFlagIfUnset("BOARD_SEPOLICY_VERS", &halManifest->device.mSepolicyVersion);
+
             if (!setDeviceFcmVersion(halManifest)) {
                 return false;
             }