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

Commit 3fdbd9f9 authored by Yifan Hong's avatar Yifan Hong
Browse files

Update to use bitness info in VINTF. 

Bug: 35966597
Test: lshal -ir has bitness info for passthrough ref section
Test: lshal --init-vintf has bitness info in the manifest.
Change-Id: Ie9f52bb1ca30ce69856dbf44fab8287563014550
parent 8ab3bee8

cmds/lshal/Lshal.cpp

+36 −1
Original line number Diff line number Diff line
@@ -183,6 +183,26 @@ void Lshal::postprocess() { 
            }

        }

    });

    // use a double for loop here because lshal doesn't care about efficiency.

    for (TableEntry &packageEntry : mImplementationsTable) {

        std::string packageName = packageEntry.interfaceName;

        FQName fqPackageName{packageName.substr(0, packageName.find("::"))};

        if (!fqPackageName.isValid()) {

            continue;

        }

        for (TableEntry &interfaceEntry : mPassthroughRefTable) {

            if (interfaceEntry.arch != ARCH_UNKNOWN) {

                continue;

            }

            FQName interfaceName{splitFirst(interfaceEntry.interfaceName, '/').first};

            if (!interfaceName.isValid()) {

                continue;

            }

            if (interfaceName.getPackageAndVersion() == fqPackageName) {

                interfaceEntry.arch = packageEntry.arch;

            }

        }

    }

}



void Lshal::printLine(
@@ -247,10 +267,25 @@ void Lshal::dumpVintf() const { 
                    &table == &mImplementationsTable ? "" : splittedFqInstanceName.second;



            vintf::Transport transport;

            vintf::Arch arch;

            if (entry.transport == "hwbinder") {

                transport = vintf::Transport::HWBINDER;

                arch = vintf::Arch::ARCH_EMPTY;

            } else if (entry.transport == "passthrough") {

                transport = vintf::Transport::PASSTHROUGH;

                switch (entry.arch) {

                    case lshal::ARCH32:

                        arch = vintf::Arch::ARCH_32;    break;

                    case lshal::ARCH64:

                        arch = vintf::Arch::ARCH_64;    break;

                    case lshal::ARCH_BOTH:

                        arch = vintf::Arch::ARCH_32_64; break;

                    case lshal::ARCH_UNKNOWN: // fallthrough

                    default:

                        mErr << "Warning: '" << fqName.package()

                             << "' doesn't have bitness info, assuming 32+64." << std::endl;

                        arch = vintf::Arch::ARCH_32_64;

                }

            } else {

                mErr << "Warning: '" << entry.transport << "' is not a valid transport." << std::endl;

                continue;
@@ -262,7 +297,7 @@ void Lshal::dumpVintf() const { 
                    .format = vintf::HalFormat::HIDL,

                    .name = fqName.package(),

                    .impl = {.implLevel = vintf::ImplLevel::GENERIC, .impl = ""},

                    .transport = transport

                    .transportArch = {transport, arch}

                })) {

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

                    continue;

cmds/lshal/TableEntry.h

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ using TableEntrySource = unsigned int; 


enum : unsigned int {

    ARCH_UNKNOWN = 0,

    ARCH64       = 1 << 0,

    ARCH32       = 1 << 1,

    ARCH32       = 1 << 0,

    ARCH64       = 1 << 1,

    ARCH_BOTH    = ARCH32 | ARCH64

};

using Architecture = unsigned int;