commit c8316072b66f305f2274877b7aea285a9c29ed05
author Yifan Hong <elsk@google.com> Mon Apr 17 18:36:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 17 18:36:03 2017 +0000
tree 4f39ebf0878d622deb3632fc3eb1ea217b0a9c22
parent 3ec7db90cc5fffe24c18a92e0fa2275234c38860
parent f3e73b9f5f1aa62f2c6ba122ccc76db2ad3c8882

Merge "Update to allow multiple HALs in a manifest." am: dd315948db
am: f3e73b9f5f

Change-Id: Ia477327f1284271379b3a47cd8720ce4899812cb

cmds/lshal/Lshal.cpp

diff --git a/cmds/lshal/Lshal.cpp b/cmds/lshal/Lshal.cpp
index 4c57361..33bc43c 100644
--- a/cmds/lshal/Lshal.cpp
+++ b/cmds/lshal/Lshal.cpp
@@ -296,7 +296,7 @@
                 continue;
             }
 
-            vintf::ManifestHal *hal = manifest.getHal(fqName.package());
+            vintf::ManifestHal *hal = manifest.getAnyHal(fqName.package());
             if (hal == nullptr) {
                 if (!manifest.add(vintf::ManifestHal{
                     .format = vintf::HalFormat::HIDL,
@@ -306,7 +306,7 @@
                     mErr << "Warning: cannot add hal '" << fqInstanceName << "'" << std::endl;
                     continue;
                 }
-                hal = manifest.getHal(fqName.package());
+                hal = manifest.getAnyHal(fqName.package());
             }
             if (hal == nullptr) {
                 mErr << "Warning: cannot get hal '" << fqInstanceName