Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a46e2f84 authored by Yifan Hong's avatar Yifan Hong
Browse files

Update to allow multiple HALs in a manifest. 

Test: libvintf_test
Test: lshal --init_vintf

Bug: 37294247
Change-Id: I202787d7856db6e06e595bd52c644f6a0eefcb66
parent 4cc7755c

cmds/lshal/Lshal.cpp

+2 −2
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ void Lshal::dumpVintf() const { 
                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,
@@ -307,7 +307,7 @@ void Lshal::dumpVintf() const { 
                    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