diff options
| -rw-r--r-- | libs/input/Android.bp | 3 | ||||
| -rw-r--r-- | libs/input/KeyLayoutMap.cpp | 11 | ||||
| -rw-r--r-- | libs/input/tests/Android.bp | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/libs/input/Android.bp b/libs/input/Android.bp index 022dfaddc1..a67ed29808 100644 --- a/libs/input/Android.bp +++ b/libs/input/Android.bp @@ -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: [ diff --git a/libs/input/KeyLayoutMap.cpp b/libs/input/KeyLayoutMap.cpp index 3c1ae3e41b..ab8c341b15 100644 --- a/libs/input/KeyLayoutMap.cpp +++ b/libs/input/KeyLayoutMap.cpp @@ -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()) { diff --git a/libs/input/tests/Android.bp b/libs/input/tests/Android.bp index e7224ff752..3fc7d9d568 100644 --- a/libs/input/tests/Android.bp +++ b/libs/input/tests/Android.bp @@ -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/*", |