summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2018-03-19 19:26:53 -0500
committerYifan Hong2018-03-20 00:29:17 -0500
commitf079a3d2f2ad5b54e28a7ce73e64402bc0570803 (patch)
tree595ae9005a7182521660db23a4a3191120b9b705 /ManifestHal.cpp
parentaa68f24145641de2a5a2ff7c15c59ee46a69b3c7 (diff)
downloadplatform-system-libvintf-f079a3d2f2ad5b54e28a7ce73e64402bc0570803.tar.gz
platform-system-libvintf-f079a3d2f2ad5b54e28a7ce73e64402bc0570803.tar.xz
platform-system-libvintf-f079a3d2f2ad5b54e28a7ce73e64402bc0570803.zip
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
Diffstat (limited to 'ManifestHal.cpp')
-rw-r--r--ManifestHal.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/ManifestHal.cpp b/ManifestHal.cpp
index 1576c80..c0f4c8e 100644
--- a/ManifestHal.cpp
+++ b/ManifestHal.cpp
@@ -55,8 +55,8 @@ bool ManifestHal::forEachInstance(const std::function<bool(const ManifestInstanc
55 // TODO(b/73556059): Store ManifestInstance as well to avoid creating temps 55 // TODO(b/73556059): Store ManifestInstance as well to avoid creating temps
56 FqInstance fqInstance; 56 FqInstance fqInstance;
57 if (fqInstance.setTo(getName(), v.majorVer, v.minorVer, intf.name, instance)) { 57 if (fqInstance.setTo(getName(), v.majorVer, v.minorVer, intf.name, instance)) {
58 if (!func(ManifestInstance(std::move(fqInstance), 58 if (!func(ManifestInstance(std::move(fqInstance), TransportArch{transportArch},
59 TransportArch{transportArch}))) { 59 format))) {
60 return false; 60 return false;
61 } 61 }
62 } 62 }
@@ -129,7 +129,7 @@ bool ManifestHal::insertInstances(const std::set<FqInstance>& fqInstances, std::
129 } 129 }
130 return false; 130 return false;
131 } 131 }
132 mAdditionalInstances.emplace(std::move(withPackage), this->transportArch); 132 mAdditionalInstances.emplace(std::move(withPackage), this->transportArch, this->format);
133 } 133 }
134 134
135 return true; 135 return true;