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

Commit cc7762c6 authored by Jae Shin's avatar Jae Shin Committed by android-build-merger
Browse files

resolve merge conflicts of 8007bdd7 to stage-aosp-master 

am: 5c34e489

Change-Id: Ic2cb90ffcc2c77a9a97098c6f15e3d96a9d9c12a
parents 66707835 5c34e489

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 −2
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\"",

    ],
@@ -152,7 +151,6 @@ cc_test { 
cc_defaults {

    name: "gles_libs_defaults",

    defaults: ["gl_libs_defaults"],

    vendor_available: true,

    arch: {

        arm: {

            instruction_set: "arm",