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

Commit 9f20d92f authored by Cody Northrop's avatar Cody Northrop
Browse files

Revert "Rootless Debug for GLES" 

This reverts commit d9f0ec41.

Bug: 110883880
Test: Chrome no longer crashes
Change-Id: I57d08a33a392394bd0a2cf4d7af97a3cce7ed8f5
parent 5fbd8a3a

libs/graphicsenv/Android.bp

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




    shared_libs: [

    shared_libs: [

        "liblog",

        "liblog",

        "libcutils",

    ],

    ],





    export_include_dirs: ["include"],

    export_include_dirs: ["include"],

libs/graphicsenv/GraphicsEnv.cpp

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

#define LOG_TAG "GraphicsEnv"

#include <graphicsenv/GraphicsEnv.h>

#include <graphicsenv/GraphicsEnv.h>





#include <sys/prctl.h>



#include <mutex>

#include <mutex>





#include <android/dlext.h>

#include <android/dlext.h>

#include <cutils/properties.h>

#include <log/log.h>

#include <log/log.h>





// TODO(b/37049319) Get this from a header once one exists

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

    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) {

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

    if (!mDriverPath.empty()) {

    if (!mDriverPath.empty()) {

        ALOGV("ignoring attempt to change driver path from '%s' to '%s'",

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

const char* android_getAngleAppPref() {

    return android::GraphicsEnv::getInstance().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 Original line Diff line number Diff line
@@ -29,8 +29,6 @@ class GraphicsEnv { 
public:

public:

    static GraphicsEnv& getInstance();

    static GraphicsEnv& getInstance();





    int getCanLoadSystemLibraries();



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

    // 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

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

    // (drivers must be stored uncompressed and page aligned); such elements

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

const char* android_getAngleAppName();

const char* android_getAngleAppPref();

const char* android_getAngleAppPref();

bool android_getAngleDeveloperOptIn();

bool android_getAngleDeveloperOptIn();

    const char* android_getLayerPaths();

    const char* android_getDebugLayers();

}

}





#endif // ANDROID_UI_GRAPHICS_ENV_H
 
#endif // ANDROID_UI_GRAPHICS_ENV_H

opengl/libs/Android.bp

+0 −4
Original line number Original line Diff line number Diff line
@@ -140,7 +140,6 @@ cc_library_shared { 
        "EGL/egl_cache.cpp",

        "EGL/egl_cache.cpp",

        "EGL/egl_display.cpp",

        "EGL/egl_display.cpp",

        "EGL/egl_object.cpp",

        "EGL/egl_object.cpp",

        "EGL/egl_layers.cpp",

        "EGL/egl.cpp",

        "EGL/egl.cpp",

        "EGL/eglApi.cpp",

        "EGL/eglApi.cpp",

        "EGL/egl_platform_entries.cpp",

        "EGL/egl_platform_entries.cpp",
@@ -151,11 +150,8 @@ cc_library_shared { 
        "libvndksupport",

        "libvndksupport",

        "android.hardware.configstore@1.0",

        "android.hardware.configstore@1.0",

        "android.hardware.configstore-utils",

        "android.hardware.configstore-utils",

        "libbase",

        "libhidlbase",

        "libhidlbase",

        "libhidltransport",

        "libhidltransport",

        "libnativebridge",

        "libnativeloader",

        "libutils",

        "libutils",

    ],

    ],

    static_libs: [

    static_libs: [

opengl/libs/EGL/egl.cpp

+2 −9
Original line number Original line Diff line number Diff line
@@ -30,10 +30,11 @@ 
#include "egl_tls.h"

#include "egl_tls.h"

#include "egl_display.h"

#include "egl_display.h"

#include "egl_object.h"

#include "egl_object.h"

#include "egl_layers.h"

#include "CallStack.h"

#include "CallStack.h"

#include "Loader.h"

#include "Loader.h"





typedef __eglMustCastToProperFunctionPointerType EGLFuncPointer;



// ----------------------------------------------------------------------------

// ----------------------------------------------------------------------------

namespace android {

namespace android {

// ----------------------------------------------------------------------------

// ----------------------------------------------------------------------------
@@ -195,14 +196,6 @@ static EGLBoolean egl_init_drivers_locked() { 
        cnx->dso = loader.open(cnx);

        cnx->dso = loader.open(cnx);

    }

    }





    // Check to see if any layers are enabled and route functions through them

    if (cnx->dso) {

        // Layers can be enabled long after the drivers have been loaded.

        // They will only be initialized once.

        LayerLoader& layer_loader(LayerLoader::getInstance());

        layer_loader.InitLayers(cnx);

    }



    return cnx->dso ? EGL_TRUE : EGL_FALSE;

    return cnx->dso ? EGL_TRUE : EGL_FALSE;

}

}