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

Commit 3f669216 authored by Jooyung Han's avatar Jooyung Han
Browse files

libinput: use libkernelconfigs insteadof libvintf 

We'd like to limit the direct usage of libvintf.

Bug: 270169217
Test: atest libinput_tests
Change-Id: I7630116345e1db736a8173467fc865cea6ec4e96
parent d3eabb9d

libs/input/Android.bp

+2 −1
Original line number Original line Diff line number Diff line
@@ -220,7 +220,7 @@ cc_library { 
        "libPlatformProperties",

        "libPlatformProperties",

        "libtinyxml2",

        "libtinyxml2",

        "libutils",

        "libutils",

        "libvintf",

        "libz", // needed by libkernelconfigs

        "server_configurable_flags",

        "server_configurable_flags",

    ],

    ],
@@ -239,6 +239,7 @@ cc_library { 
        "libgui_window_info_static",

        "libgui_window_info_static",

        "libui-types",

        "libui-types",

        "libtflite_static",

        "libtflite_static",

        "libkernelconfigs",

    ],

    ],





    whole_static_libs: [

    whole_static_libs: [

libs/input/KeyLayoutMap.cpp

+4 −7
Original line number Original line Diff line number Diff line
@@ -27,8 +27,7 @@ 
#include <utils/Timers.h>

#include <utils/Timers.h>

#include <utils/Tokenizer.h>

#include <utils/Tokenizer.h>

#if defined(__ANDROID__)

#if defined(__ANDROID__)

#include <vintf/RuntimeInfo.h>

#include <vintf/KernelConfigs.h>

#include <vintf/VintfObject.h>

#endif

#endif





#include <cstdlib>

#include <cstdlib>
@@ -98,12 +97,10 @@ static const std::unordered_map<std::string_view, InputDeviceSensorType> SENSOR_ 




bool kernelConfigsArePresent(const std::set<std::string>& configs) {

bool kernelConfigsArePresent(const std::set<std::string>& configs) {

#if defined(__ANDROID__)

#if defined(__ANDROID__)

    std::shared_ptr<const android::vintf::RuntimeInfo> runtimeInfo =

    std::map<std::string, std::string> kernelConfigs;

            android::vintf::VintfObject::GetInstance()->getRuntimeInfo(

    const status_t result = android::kernelconfigs::LoadKernelConfigs(&kernelConfigs);

                    vintf::RuntimeInfo::FetchFlag::CONFIG_GZ);

    LOG_ALWAYS_FATAL_IF(result != OK, "Kernel configs could not be fetched");

    LOG_ALWAYS_FATAL_IF(runtimeInfo == nullptr, "Kernel configs could not be fetched");





    const std::map<std::string, std::string>& kernelConfigs = runtimeInfo->kernelConfigs();

    for (const std::string& requiredConfig : configs) {

    for (const std::string& requiredConfig : configs) {

        const auto configIt = kernelConfigs.find(requiredConfig);

        const auto configIt = kernelConfigs.find(requiredConfig);

        if (configIt == kernelConfigs.end()) {

        if (configIt == kernelConfigs.end()) {

libs/input/tests/Android.bp

+2 −1
Original line number Original line Diff line number Diff line
@@ -36,8 +36,10 @@ cc_test { 
        "libgmock",

        "libgmock",

        "libgui_window_info_static",

        "libgui_window_info_static",

        "libinput",

        "libinput",

        "libkernelconfigs",

        "libtflite_static",

        "libtflite_static",

        "libui-types",

        "libui-types",

        "libz", // needed by libkernelconfigs

    ],

    ],

    cflags: [

    cflags: [

        "-Wall",

        "-Wall",
@@ -61,7 +63,6 @@ cc_test { 
        "libPlatformProperties",

        "libPlatformProperties",

        "libtinyxml2",

        "libtinyxml2",

        "libutils",

        "libutils",

        "libvintf",

        "server_configurable_flags",

        "server_configurable_flags",

    ],

    ],

    data: [

    data: [