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

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

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

am: f3e73b9f

Change-Id: Ia477327f1284271379b3a47cd8720ce4899812cb
parents 3ec7db90 f3e73b9f

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,
@@ -306,7 +306,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