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

Commit d2bc3ac8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Mark libEGL, GLESv1_CM, GLESv2, and GLESv3 as LLNDK" into oc-mr1-dev

parents 9afe0a99 00b15b8f

libs/gui/GLConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include <utils/String8.h>

#include <utils/Trace.h>



EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name);

extern "C" EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name);

#define CROP_EXT_STR "EGL_ANDROID_image_crop"

#define PROT_CONTENT_EXT_STR "EGL_EXT_protected_content"

#define EGL_PROTECTED_CONTENT_EXT 0x32C0

libs/gui/SyncFeatures.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


#include <private/gui/SyncFeatures.h>



EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name);

extern "C" EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name);



namespace android {

libs/gui/tests/SurfaceTextureClient_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <utils/Log.h>

#include <utils/Thread.h>



EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name);

extern "C" EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name);

#define CROP_EXT_STR "EGL_ANDROID_image_crop"



namespace android {

opengl/Android.bp

+24 −0
Original line number Diff line number Diff line
@@ -52,6 +52,30 @@ ndk_headers { 
    license: "include/KHR/NOTICE",

}



llndk_library {

    name: "libEGL",

    symbol_file: "libs/libEGL.map.txt",

    export_include_dirs: ["include"],

}



llndk_library {

    name: "libGLESv1_CM",

    symbol_file: "libs/libGLESv1_CM.map.txt",

    export_include_dirs: ["include"],

}



llndk_library {

    name: "libGLESv2",

    symbol_file: "libs/libGLESv2.map.txt",

    export_include_dirs: ["include"],

}



llndk_library {

    name: "libGLESv3",

    symbol_file: "libs/libGLESv3.map.txt",

    export_include_dirs: ["include"],

}



cc_library_headers {

    name: "gl_headers",

    vendor_available: true,

opengl/libs/Android.bp

+0 −8
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ cc_defaults { 
cc_defaults {

    name: "egl_libs_defaults",

    defaults: ["gl_libs_defaults"],

    vendor_available: true,

    cflags: [

        "-DLOG_TAG=\"libEGL\"",

    ],
@@ -117,9 +116,6 @@ cc_library_static { 
cc_library_shared {

    name: "libEGL",

    defaults: ["egl_libs_defaults"],

    vndk: {

        enabled: true,

    },

    srcs: [

        "EGL/egl_tls.cpp",

        "EGL/egl_cache.cpp",
@@ -155,7 +151,6 @@ cc_test { 
cc_defaults {

    name: "gles_libs_defaults",

    defaults: ["gl_libs_defaults"],

    vendor_available: true,

    arch: {

        arm: {

            instruction_set: "arm",
@@ -183,9 +178,6 @@ cc_library_shared { 
cc_library_shared {

    name: "libGLESv2",

    defaults: ["gles_libs_defaults"],

    vndk: {

        enabled: true,

    },

    srcs: ["GLES2/gl2.cpp"],

    cflags: ["-DLOG_TAG=\"libGLESv2\""],

}