diff options
Diffstat (limited to 'src/core/surface_factory_qt.cpp')
-rw-r--r-- | src/core/surface_factory_qt.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp index 3b4dcfc8b..9db9a9d2c 100644 --- a/src/core/surface_factory_qt.cpp +++ b/src/core/surface_factory_qt.cpp @@ -50,7 +50,7 @@ #include <QGuiApplication> #include <qpa/qplatformnativeinterface.h> -#if defined(USE_OZONE) +#if defined(USE_OZONE) || defined(OS_ANDROID) #include <EGL/egl.h> #ifndef QT_LIBDIR_EGL @@ -62,7 +62,12 @@ bool SurfaceFactoryQt::LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library, SetGLGetProcAddressProcCallback set_gl_get_proc_address) { - +#if defined(OS_ANDROID) + // This is done in gl_implementation_android.cc for now. We might need to switch if we + // start supporting the emulator platform but that would be a more intrusive change. + Q_UNREACHABLE(); + return false; +#else base::FilePath libEGLPath = toFilePath(QT_LIBDIR_EGL); libEGLPath = libEGLPath.Append("libEGL.so"); base::NativeLibrary eglLibrary = gfx::LoadLibrary(libEGLPath); @@ -91,6 +96,7 @@ bool SurfaceFactoryQt::LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library, gfx::AddGLNativeLibrary(eglLibrary); gfx::AddGLNativeLibrary(gles2Library); return true; +#endif } intptr_t SurfaceFactoryQt::GetNativeDisplay() |