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

Commit c180f57c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [5254540, 5255809, 5256026, 5256027, 5256028] into qt-release 

Change-Id: I830c03b9768f3e7ce7d6e6f0d62730eac10edb99
parents 8b743a26 d38a0e32

libs/graphicsenv/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ cc_library_shared { 


    shared_libs: [

        "liblog",

        "libcutils",

    ],



    export_include_dirs: ["include"],

libs/graphicsenv/GraphicsEnv.cpp

+0 −17
Original line number Diff line number Diff line
@@ -18,12 +18,9 @@ 
#define LOG_TAG "GraphicsEnv"

#include <graphicsenv/GraphicsEnv.h>



#include <sys/prctl.h>



#include <mutex>



#include <android/dlext.h>

#include <cutils/properties.h>

#include <log/log.h>



// TODO(b/37049319) Get this from a header once one exists
@@ -49,14 +46,6 @@ namespace android { 
    return env;

}



int GraphicsEnv::getCanLoadSystemLibraries() {

    if (property_get_bool("ro.debuggable", false) && prctl(PR_GET_DUMPABLE, 0, 0, 0, 0)) {

        // Return an integer value since this crosses library boundaries

        return 1;

    }

    return 0;

}



void GraphicsEnv::setDriverPath(const std::string path) {

    if (!mDriverPath.empty()) {

        ALOGV("ignoring attempt to change driver path from '%s' to '%s'",
@@ -192,10 +181,4 @@ bool android_getAngleDeveloperOptIn() { 
const char* android_getAngleAppPref() {

    return android::GraphicsEnv::getInstance().getAngleAppPref();

}

const char* android_getLayerPaths() {

    return android::GraphicsEnv::getInstance().getLayerPaths().c_str();

}

const char* android_getDebugLayers() {

    return android::GraphicsEnv::getInstance().getDebugLayers().c_str();

}

}

libs/graphicsenv/include/graphicsenv/GraphicsEnv.h

+5 −9
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ class GraphicsEnv { 
public:

    static GraphicsEnv& getInstance();



    int getCanLoadSystemLibraries();



    // Set a search path for loading graphics drivers. The path is a list of

    // directories separated by ':'. A directory can be contained in a zip file

    // (drivers must be stored uncompressed and page aligned); such elements
@@ -92,8 +90,6 @@ extern "C" { 
const char* android_getAngleAppName();

const char* android_getAngleAppPref();

bool android_getAngleDeveloperOptIn();

    const char* android_getLayerPaths();

    const char* android_getDebugLayers();

}



#endif // ANDROID_UI_GRAPHICS_ENV_H

opengl/libs/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -140,10 +140,8 @@ cc_library_shared { 
        "EGL/egl_cache.cpp",

        "EGL/egl_display.cpp",

        "EGL/egl_object.cpp",

        "EGL/egl_layers.cpp",

        "EGL/egl.cpp",

        "EGL/eglApi.cpp",

        "EGL/egl_platform_entries.cpp",

        "EGL/Loader.cpp",

        "EGL/egl_angle_platform.cpp",

    ],
@@ -151,11 +149,8 @@ cc_library_shared { 
        "libvndksupport",

        "android.hardware.configstore@1.0",

        "android.hardware.configstore-utils",

        "libbase",

        "libhidlbase",

        "libhidltransport",

        "libnativebridge",

        "libnativeloader",

        "libutils",

    ],

    static_libs: [

opengl/libs/EGL/Loader.cpp

+2 −22
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#endif

#include <vndksupport/linker.h>



#include "egl_platform_entries.h"

#include "egl_trace.h"

#include "egldefs.h"
@@ -238,12 +237,12 @@ void* Loader::open(egl_connection_t* cnx) 


    setEmulatorGlesValue();



    dso = load_driver("GLES", cnx, EGL | GLESv1_CM | GLESv2 | PLATFORM);

    dso = load_driver("GLES", cnx, EGL | GLESv1_CM | GLESv2);

    if (dso) {

        hnd = new driver_t(dso);

    } else {

        // Always load EGL first

        dso = load_driver("EGL", cnx, EGL | PLATFORM);

        dso = load_driver("EGL", cnx, EGL);

        if (dso) {

            hnd = new driver_t(dso);

            hnd->set( load_driver("GLESv1_CM", cnx, GLESv1_CM), GLESv1_CM );
@@ -624,25 +623,6 @@ void *Loader::load_driver(const char* kind, 
            return nullptr;

    }



    if (mask & PLATFORM) {

        // For each entrypoint tracked by the platform

        char const* const* entries = platform_names;

        EGLFuncPointer* curr = reinterpret_cast<EGLFuncPointer*>(&cnx->platform);



        while (*entries) {

            const char* name = *entries;

            EGLFuncPointer f = FindPlatformImplAddr(name);



            if (f == nullptr) {

                // If no entry found, update the lookup table: sPlatformImplMap

                ALOGE("No entry found in platform lookup table for %s", name);

            }



            *curr++ = f;

            entries++;

        }

    }



    if (mask & EGL) {

        getProcAddress = (getProcAddressType)dlsym(dso, "eglGetProcAddress");