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

Commit bc7936f8 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "libinput: use libkernelconfigs insteadof libvintf" into main am: 0e622d7b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2858430



Change-Id: I4a943adfdf78f089cfcdc359a95a84f4b47fdffb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88127a11 0e622d7b

libs/input/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ cc_library { 
        "liblog",

        "libPlatformProperties",

        "libtinyxml2",

        "libvintf",

        "libz", // needed by libkernelconfigs

    ],



    ldflags: [
@@ -238,6 +238,7 @@ cc_library { 
        "inputconstants-cpp",

        "libui-types",

        "libtflite_static",

        "libkernelconfigs",

    ],



    whole_static_libs: [

libs/input/KeyLayoutMap.cpp

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

#include <utils/Tokenizer.h>

#if defined(__ANDROID__)

#include <vintf/RuntimeInfo.h>

#include <vintf/VintfObject.h>

#include <vintf/KernelConfigs.h>

#endif



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


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

#if defined(__ANDROID__)

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

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

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

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

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

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

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



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

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

        const auto configIt = kernelConfigs.find(requiredConfig);

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

libs/input/tests/Android.bp

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

        "libgui_window_info_static",

        "libinput",

        "libkernelconfigs",

        "libtflite_static",

        "libui-types",

        "libz", // needed by libkernelconfigs

    ],

    cflags: [

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

        "libtinyxml2",

        "libutils",

        "libvintf",

    ],

    data: [

        "data/*",