commit f58fdca61c6e90739a114b86f8f4dd8f645d97fe
author Bo Hu <bohu@google.com> Mon May 01 06:59:23 2023 -0700
committer Bo Hu <bohu@google.com> Mon May 01 14:04:38 2023 +0000
tree f8c03381281b93844217c03c65b5a445e894f7e4
parent 7ad27504f1fcd67c4d0f3928f08bed424820f940

gfxstream-x11: handle libX11.so opening failure

When this happens, most likely it is due to missing
symlink to libX11.so.6; we will simply try the later
again.

Bug: 280284109

Test:
Intel ubuntu 22.04, launch gfxstream emulator,it
should not complain aboult failing to open
default display (XOpenDisplay should succeed)

Change-Id: Iabf7f921286b9881a1a50facd1d0c002382d3864

stream-servers/apigen-codec-common/X11Support.cpp

diff --git a/stream-servers/apigen-codec-common/X11Support.cpp b/stream-servers/apigen-codec-common/X11Support.cpp
index 356c949..8c8f55d 100644
--- a/stream-servers/apigen-codec-common/X11Support.cpp
+++ b/stream-servers/apigen-codec-common/X11Support.cpp
@@ -14,6 +14,14 @@
     public:
         X11FunctionGetter() :
             mX11Lib(android::base::SharedLibrary::open("libX11")) {
+            if (!mX11Lib) {
+                fprintf(stderr, "WARNING: could not open libX11.so, try libX11.so.6\n");
+                mX11Lib = (android::base::SharedLibrary::open("libX11.so.6"));
+                if (!mX11Lib) {
+                    fprintf(stderr, "ERROR: could not open libX11.so.6, give up\n");
+                    return;
+                }
+            }
 
 #define X11_ASSIGN_DUMMY_IMPL(funcname) mApi.funcname = dummy_##funcname;