Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bbda540 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "nullptr check on suffix." into main am: 1f2f3de8 am: 23a5896e am: f4ef534b 

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



Change-Id: I2510d90ea1cbdabf7338d992eb0cc78ddffff6ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f4e22b4 f4ef534b

opengl/libs/EGL/Loader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static void* load_system_driver(const char* kind, const char* suffix, const bool 
    void* dso = nullptr;



    // Only use sphal namespace when system ANGLE binaries are not the default drivers.

    const bool useSphalNamespace = strcmp(suffix, ANGLE_SUFFIX_VALUE) != 0;

    const bool useSphalNamespace = suffix != nullptr && strcmp(suffix, ANGLE_SUFFIX_VALUE) != 0;



    const std::string absolutePath =

            findLibrary(libraryName, useSphalNamespace ? VENDOR_LIB_EGL_DIR : SYSTEM_LIB_PATH,