Merge "Revert "[guest] Check that the singleton VirtGpuDevice matches desired capset"" into main
diff --git a/common/detector/CMakeLists.txt b/common/detector/CMakeLists.txt
index ab5c777..5e5b993 100644
--- a/common/detector/CMakeLists.txt
+++ b/common/detector/CMakeLists.txt
@@ -11,13 +11,14 @@
add_library(
libgfxstream_graphics_detector_proto
+ STATIC
${LIBGFXSTREAM_GRAPHICS_DETECTOR_SRCS}
)
target_link_libraries(
libgfxstream_graphics_detector_proto
PUBLIC
- protobuf
+ libprotobuf.a
)
target_include_directories(
diff --git a/guest/egl/eglDisplay.cpp b/guest/egl/eglDisplay.cpp
index 711f580..c18f4f5 100644
--- a/guest/egl/eglDisplay.cpp
+++ b/guest/egl/eglDisplay.cpp
@@ -283,6 +283,9 @@
{
std::vector<std::string> paths;
#if defined(__ANDROID__)
+ // Try to load from the current linker namespace first.
+ paths.push_back(basename + std::string(LIBSUFFIX));
+ // And then look into the known location.
paths.push_back(std::string(PARTITION) +
std::string(LIBDIR) +
basename +
