commit 948f68f71da599fe4d3bc5f00443d6a80d786044
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 23 00:36:48 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 23 00:36:48 2022 +0000
tree 9dec11bd27092a44f1aae6cd94b148686a3f1dd5
parent 7e59f29fef92142f60c71238d8b2b058a05f15bc
parent 7dab5ef967147c432f400fcf40ea342e0f9542c8

Merge "Do not read kernel configs on the host" am: 3d16fc0bd8 am: bd90a30c23 am: 7dab5ef967

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

Change-Id: Ia8875c85e17c82baa0eb932498213e455f1a6b4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/input/KeyLayoutMap.cpp

diff --git a/libs/input/KeyLayoutMap.cpp b/libs/input/KeyLayoutMap.cpp
index 59cc7d1..d6b4579 100644
--- a/libs/input/KeyLayoutMap.cpp
+++ b/libs/input/KeyLayoutMap.cpp
@@ -25,8 +25,10 @@
 #include <utils/Errors.h>
 #include <utils/Timers.h>
 #include <utils/Tokenizer.h>
+#if defined(__ANDROID__)
 #include <vintf/RuntimeInfo.h>
 #include <vintf/VintfObject.h>
+#endif
 
 #include <cstdlib>
 #include <string_view>
@@ -79,6 +81,7 @@
          sensorPair<InputDeviceSensorType::SIGNIFICANT_MOTION>()};
 
 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);
@@ -99,6 +102,10 @@
         }
     }
     return true;
+#else
+    (void)configs; // Suppress 'unused variable' warning
+    return true;
+#endif
 }
 
 } // namespace