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

Commit 17baed10 authored by Justin Yun's avatar Justin Yun
Browse files

libvndksupport: Do not lookup default namespace for sphal failure 

Instead of looking up default namespace for the failure of loading
sphal libs, report failure. This is only for the devices that have
sphal namespace.

Bug: 38435840
Test: sailfish builds and boots
Test: libvndksupport-tests passes
Change-Id: Ibbff5f2d5d83f6482f98677a5492777db6416967
parent 19b47ced

libvndksupport/linker.c

+5 −7
Original line number Diff line number Diff line
@@ -30,22 +30,20 @@ void* android_load_sphal_library(const char* name, int flag) { 
            .flags = ANDROID_DLEXT_USE_NAMESPACE, .library_namespace = sphal_namespace,

        };

        void* handle = android_dlopen_ext(name, flag, &dlextinfo);

        if (handle) {

            return handle;

        } else {

            ALOGW(

                "Could not load %s from sphal namespace: %s. "

                "Falling back to loading it from the current namespace,",

        if (!handle) {

            ALOGE(

                "Could not load %s from sphal namespace: %s. ",

                name, dlerror());

        }

        return handle;

    } else {

        ALOGI(

            "sphal namespace is not configured for this process. "

            "Loading %s from the current namespace instead.",

            name);

    }

        return dlopen(name, flag);

    }

}



int android_unload_sphal_library(void* handle) {

    return dlclose(handle);