commit f079a3d2f2ad5b54e28a7ce73e64402bc0570803
author Yifan Hong <elsk@google.com> Mon Mar 19 17:26:53 2018 -0700
committer Yifan Hong <elsk@google.com> Tue Mar 20 05:29:17 2018 +0000
tree 595ae9005a7182521660db23a4a3191120b9b705
parent aa68f24145641de2a5a2ff7c15c59ee46a69b3c7

HalManifest uses instances API.

Update HalManifest implementation to use instances API.

Test: libvintf_test
Test: vintf_object_test
Test: assemble_vintf -m

Bug: 73556059
Change-Id: Ib75edfe56e18f1ae8e6cbb22be56eb1e413e5c90

ManifestHal.cpp

diff --git a/ManifestHal.cpp b/ManifestHal.cpp
index 1576c80..c0f4c8e 100644
--- a/ManifestHal.cpp
+++ b/ManifestHal.cpp
@@ -55,8 +55,8 @@
                 // TODO(b/73556059): Store ManifestInstance as well to avoid creating temps
                 FqInstance fqInstance;
                 if (fqInstance.setTo(getName(), v.majorVer, v.minorVer, intf.name, instance)) {
-                    if (!func(ManifestInstance(std::move(fqInstance),
-                                               TransportArch{transportArch}))) {
+                    if (!func(ManifestInstance(std::move(fqInstance), TransportArch{transportArch},
+                                               format))) {
                         return false;
                     }
                 }
@@ -129,7 +129,7 @@
             }
             return false;
         }
-        mAdditionalInstances.emplace(std::move(withPackage), this->transportArch);
+        mAdditionalInstances.emplace(std::move(withPackage), this->transportArch, this->format);
     }
 
     return true;