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

Commit 5dc65656 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "Update to allow multiple HALs in a manifest." into oc-dev am: 1011062e 

am: 4d94d79a

Change-Id: I181b8de3dd56192b0c17e2ae245daa8e58ccc26e
parents 3270d342 4d94d79a

cmds/lshal/Lshal.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -296,7 +296,7 @@ void Lshal::dumpVintf() const { 
                continue;

                continue;

            }

            }





            vintf::ManifestHal *hal = manifest.getHal(fqName.package());

            vintf::ManifestHal *hal = manifest.getAnyHal(fqName.package());

            if (hal == nullptr) {

            if (hal == nullptr) {

                if (!manifest.add(vintf::ManifestHal{

                if (!manifest.add(vintf::ManifestHal{

                    .format = vintf::HalFormat::HIDL,

                    .format = vintf::HalFormat::HIDL,
@@ -306,7 +306,7 @@ void Lshal::dumpVintf() const { 
                    mErr << "Warning: cannot add hal '" << fqInstanceName << "'" << std::endl;

                    mErr << "Warning: cannot add hal '" << fqInstanceName << "'" << std::endl;

                    continue;

                    continue;

                }

                }

                hal = manifest.getHal(fqName.package());

                hal = manifest.getAnyHal(fqName.package());

            }

            }

            if (hal == nullptr) {

            if (hal == nullptr) {

                mErr << "Warning: cannot get hal '" << fqInstanceName

                mErr << "Warning: cannot get hal '" << fqInstanceName