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

Commit 9249cbbe authored by dimitry's avatar dimitry
Browse files

Apply version-script to libGLESv2 library 

Hide unintentionally exported symbols, validate that symbols mentioned
in the map file are actually exported by the library.

Also add missing gl*Query*EXT symbols to the list. Part of them are
used by hwui unit tests. They were exported implicitly before, this
change make it explicit.

Bug: http://b/69603741
Test: make
Change-Id: Iac3b821477a4e88bd507596324a45c7afaf18ba6
parent 4ad97e2b

opengl/libs/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -208,6 +208,7 @@ cc_library_shared { 
    defaults: ["gles_libs_defaults"],

    defaults: ["gles_libs_defaults"],

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

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

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

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

    version_script: "libGLESv2.map.txt",

}

}





//##############################################################################

//##############################################################################

opengl/libs/libGLESv1_CM.map.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -179,6 +179,7 @@ LIBGLESV1_CM { 
    glLoadPaletteFromModelViewMatrixOES;

    glLoadPaletteFromModelViewMatrixOES;

    glLogicOp;

    glLogicOp;

    glMapBufferOES;

    glMapBufferOES;

    glMapBufferRangeEXT;

    glMaterialf;

    glMaterialf;

    glMaterialfv;

    glMaterialfv;

    glMaterialx;

    glMaterialx;

opengl/libs/libGLESv2.map.txt

+128 −0
Original line number Original line Diff line number Diff line 
LIBGLESV2 {

LIBGLESV2 {

  global:

  global:

    glActiveShaderProgramEXT;

    glActiveTexture;

    glActiveTexture;

    glAttachShader;

    glAttachShader;

    glBeginQueryEXT;

    glBeginPerfMonitorAMD;

    glBeginPerfMonitorAMD;

    glBindAttribLocation;

    glBindAttribLocation;

    glBindBuffer;

    glBindBuffer;

    glBindFragDataLocationEXT; # introduced=24

    glBindFragDataLocationIndexedEXT; # introduced=24

    glBindFramebuffer;

    glBindFramebuffer;

    glBindProgramPipelineEXT;

    glBindRenderbuffer;

    glBindRenderbuffer;

    glBindTexture;

    glBindTexture;

    glBindVertexArrayOES; # introduced-mips=9 introduced-x86=9

    glBindVertexArrayOES; # introduced-mips=9 introduced-x86=9

    glBlendColor;

    glBlendColor;

    glBlendEquation;

    glBlendEquation;

    glBlendEquationiOES; # introduced=24

    glBlendEquationSeparate;

    glBlendEquationSeparate;

    glBlendEquationSeparateiOES; # introduced=24

    glBlendFunc;

    glBlendFunc;

    glBlendFunciOES; # introduced=24

    glBlendFuncSeparate;

    glBlendFuncSeparate;

    glBlendFuncSeparateiOES; # introduced=24

    glBufferData;

    glBufferData;

    glBufferSubData;

    glBufferSubData;

    glCheckFramebufferStatus;

    glCheckFramebufferStatus;
@@ -22,6 +31,7 @@ LIBGLESV2 { 
    glClearDepthf;

    glClearDepthf;

    glClearStencil;

    glClearStencil;

    glColorMask;

    glColorMask;

    glColorMaskiOES; # introduced=24

    glCompileShader;

    glCompileShader;

    glCompressedTexImage2D;

    glCompressedTexImage2D;

    glCompressedTexImage3DOES;

    glCompressedTexImage3DOES;
@@ -34,12 +44,16 @@ LIBGLESV2 { 
    glCoverageOperationNV; # introduced-mips=9 introduced-x86=9

    glCoverageOperationNV; # introduced-mips=9 introduced-x86=9

    glCreateProgram;

    glCreateProgram;

    glCreateShader;

    glCreateShader;

    glCreateShaderProgramvEXT;

    glCullFace;

    glCullFace;

    glDebugMessageCallbackKHR; # introduced=21

    glDeleteBuffers;

    glDeleteBuffers;

    glDeleteFencesNV;

    glDeleteFencesNV;

    glDeleteFramebuffers;

    glDeleteFramebuffers;

    glDeletePerfMonitorsAMD;

    glDeletePerfMonitorsAMD;

    glDeleteProgram;

    glDeleteProgram;

    glDeleteProgramPipelinesEXT;

    glDeleteQueriesEXT;

    glDeleteRenderbuffers;

    glDeleteRenderbuffers;

    glDeleteShader;

    glDeleteShader;

    glDeleteTextures;

    glDeleteTextures;
@@ -49,17 +63,32 @@ LIBGLESV2 { 
    glDepthRangef;

    glDepthRangef;

    glDetachShader;

    glDetachShader;

    glDisable;

    glDisable;

    glDisableiOES; # introduced=24

    glDisableDriverControlQCOM;

    glDisableDriverControlQCOM;

    glDisableVertexAttribArray;

    glDisableVertexAttribArray;

    glDiscardFramebufferEXT; # introduced-mips=9 introduced-x86=9

    glDiscardFramebufferEXT; # introduced-mips=9 introduced-x86=9

    glDrawArrays;

    glDrawArrays;

    glDrawArraysInstancedBaseInstanceEXT; # introduced=24

    glDrawArraysInstancedEXT; # introduced=21

    glDrawBuffersEXT; # introduced=21

    glDrawBuffersIndexedEXT; # introduced=21

    glDrawElements;

    glDrawElements;

    glDrawElementsBaseVertexEXT; # introduced=24

    glDrawElementsBaseVertexOES; # introduced=24

    glDrawElementsInstancedBaseInstanceEXT; # introduced=24

    glDrawElementsInstancedBaseVertexEXT; # introduced=24

    glDrawElementsInstancedBaseVertexOES; # introduced=24

    glDrawElementsInstancedBaseVertexBaseInstanceEXT; # introduced=24

    glDrawRangeElementsBaseVertexEXT; # introduced=24

    glDrawRangeElementsBaseVertexOES; # introduced=24

    glEGLImageTargetRenderbufferStorageOES;

    glEGLImageTargetRenderbufferStorageOES;

    glEGLImageTargetTexture2DOES;

    glEGLImageTargetTexture2DOES;

    glEnable;

    glEnable;

    glEnableiOES; # introduced=24

    glEnableDriverControlQCOM;

    glEnableDriverControlQCOM;

    glEnableVertexAttribArray;

    glEnableVertexAttribArray;

    glEndPerfMonitorAMD;

    glEndPerfMonitorAMD;

    glEndQueryEXT;

    glEndTilingQCOM; # introduced-mips=9 introduced-x86=9

    glEndTilingQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetBufferPointervQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetBufferPointervQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetBuffersQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetBuffersQCOM; # introduced-mips=9 introduced-x86=9
@@ -76,17 +105,20 @@ LIBGLESV2 { 
    glFinish;

    glFinish;

    glFinishFenceNV;

    glFinishFenceNV;

    glFlush;

    glFlush;

    glFlushMappedBufferRangeEXT; # introduced=21

    glFramebufferRenderbuffer;

    glFramebufferRenderbuffer;

    glFramebufferTexture2D;

    glFramebufferTexture2D;

    glFramebufferTexture2DMultisampleIMG; # introduced-mips=9 introduced-x86=9

    glFramebufferTexture2DMultisampleIMG; # introduced-mips=9 introduced-x86=9

    glFramebufferTexture2DMultisampleEXT; # introduced=28

    glFramebufferTexture2DMultisampleEXT; # introduced=28

    glFramebufferTexture3DOES;

    glFramebufferTexture3DOES;

    glFramebufferTextureOES; # introduced=24

    glFrontFace;

    glFrontFace;

    glGenBuffers;

    glGenBuffers;

    glGenFencesNV;

    glGenFencesNV;

    glGenFramebuffers;

    glGenFramebuffers;

    glGenPerfMonitorsAMD;

    glGenPerfMonitorsAMD;

    glGenRenderbuffers;

    glGenRenderbuffers;

    glGenQueriesEXT;

    glGenTextures;

    glGenTextures;

    glGenVertexArraysOES; # introduced-mips=9 introduced-x86=9

    glGenVertexArraysOES; # introduced-mips=9 introduced-x86=9

    glGenerateMipmap;

    glGenerateMipmap;
@@ -102,24 +134,49 @@ LIBGLESV2 { 
    glGetError;

    glGetError;

    glGetFenceivNV;

    glGetFenceivNV;

    glGetFloatv;

    glGetFloatv;

    glGetFragDataIndexEXT; # introduced=24

    glGetFramebufferAttachmentParameteriv;

    glGetFramebufferAttachmentParameteriv;

    glGetGraphicsResetStatusEXT;

    glGetGraphicsResetStatusKHR; # introduced=24

    glGetIntegeri_vEXT; # introduced=21

    glGetIntegerv;

    glGetIntegerv;

    glGetnUniformfvEXT;

    glGetnUniformfvKHR; # introduced=24

    glGetnUniformivEXT;

    glGetnUniformivKHR; # introduced=24

    glGetnUniformuivKHR; # introduced=24

    glGetObjectLabelEXT;

    glCopyImageSubDataOES; # introduced=24

    glGetPerfMonitorCounterDataAMD;

    glGetPerfMonitorCounterDataAMD;

    glGetPerfMonitorCounterInfoAMD;

    glGetPerfMonitorCounterInfoAMD;

    glGetPerfMonitorCounterStringAMD;

    glGetPerfMonitorCounterStringAMD;

    glGetPerfMonitorCountersAMD;

    glGetPerfMonitorCountersAMD;

    glGetPerfMonitorGroupStringAMD;

    glGetPerfMonitorGroupStringAMD;

    glGetPerfMonitorGroupsAMD;

    glGetPerfMonitorGroupsAMD;

    glGetPointervKHR; # introduced=21

    glGetProgramBinaryOES;

    glGetProgramBinaryOES;

    glGetProgramInfoLog;

    glGetProgramInfoLog;

    glGetProgramiv;

    glGetProgramiv;

    glGenProgramPipelinesEXT;

    glGetProgramPipelineInfoLogEXT;

    glGetProgramPipelineivEXT;

    glGetProgramResourceLocationIndexEXT; # introduced=24

    glGetQueryivEXT;

    glGetQueryObjectivEXT; # introduced=21

    glGetQueryObjectuivEXT;

    glGetQueryObjecti64vEXT; # introduced=21

    glGetQueryObjectui64vEXT; # introduced=21

    glGetRenderbufferParameteriv;

    glGetRenderbufferParameteriv;

    glGetSamplerParameterIivOES; # introduced=24

    glGetSamplerParameterIuivOES; # introduced=24

    glGetShaderInfoLog;

    glGetShaderInfoLog;

    glGetShaderPrecisionFormat;

    glGetShaderPrecisionFormat;

    glGetShaderSource;

    glGetShaderSource;

    glGetShaderiv;

    glGetShaderiv;

    glGetString;

    glGetString;

    glGetTexParameterfv;

    glGetTexParameterfv;

    glGetTexParameterIivOES; # introduced=24

    glGetTexParameterIuivOES; # introduced=24

    glGetTexParameteriv;

    glGetTexParameteriv;

    glGetUniformLocation;

    glGetUniformLocation;

    glGetUniformfv;

    glGetUniformfv;
@@ -128,29 +185,83 @@ LIBGLESV2 { 
    glGetVertexAttribfv;

    glGetVertexAttribfv;

    glGetVertexAttribiv;

    glGetVertexAttribiv;

    glHint;

    glHint;

    glInsertEventMarkerEXT;

    glIsBuffer;

    glIsBuffer;

    glIsEnabled;

    glIsEnabled;

    glIsEnablediOES; # introduced=24

    glIsFenceNV;

    glIsFenceNV;

    glIsFramebuffer;

    glIsFramebuffer;

    glIsProgram;

    glIsProgram;

    glIsProgramPipelineEXT;

    glIsQueryEXT;

    glIsRenderbuffer;

    glIsRenderbuffer;

    glIsShader;

    glIsShader;

    glIsTexture;

    glIsTexture;

    glIsVertexArrayOES; # introduced-mips=9 introduced-x86=9

    glIsVertexArrayOES; # introduced-mips=9 introduced-x86=9

    glLabelObjectEXT;

    glLineWidth;

    glLineWidth;

    glLinkProgram;

    glLinkProgram;

    glMapBufferOES;

    glMapBufferOES;

    glMultiDrawArraysEXT; # introduced-mips=9 introduced-x86=9

    glMultiDrawArraysEXT; # introduced-mips=9 introduced-x86=9

    glMultiDrawArraysIndirectEXT; # introduced=24

    glMultiDrawElementsIndirectEXT; # introduced=24

    glMultiDrawElementsBaseVertexEXT; # introduced=24

    glDrawElementsInstancedEXT; # introduced=21

    glMultiDrawElementsEXT; # introduced-mips=9 introduced-x86=9

    glMultiDrawElementsEXT; # introduced-mips=9 introduced-x86=9

    glPatchParameteriOES; # introduced=24

    glPixelStorei;

    glPixelStorei;

    glPolygonOffset;

    glPolygonOffset;

    glPopGroupMarkerEXT; # introduced=21

    glPrimitiveBoundingBoxOES; # introduced=24

    glProgramBinaryOES;

    glProgramBinaryOES;

    glProgramParameteriEXT;

    glProgramUniform1fEXT;

    glProgramUniform1fvEXT;

    glProgramUniform1iEXT;

    glProgramUniform1ivEXT;

    glProgramUniform1uiEXT; # introduced=21

    glProgramUniform1uivEXT; # introduced=21

    glProgramUniform2fEXT;

    glProgramUniform2fvEXT;

    glProgramUniform2iEXT;

    glProgramUniform2ivEXT;

    glProgramUniform2uiEXT; # introduced=21

    glProgramUniform2uivEXT; # introduced=21

    glProgramUniform3fEXT;

    glProgramUniform3fvEXT;

    glProgramUniform3iEXT;

    glProgramUniform3ivEXT;

    glProgramUniform3uiEXT; # introduced=21

    glProgramUniform3uivEXT; # introduced=21

    glProgramUniform4fEXT;

    glProgramUniform4fvEXT;

    glProgramUniform4iEXT;

    glProgramUniform4ivEXT;

    glProgramUniform4uiEXT; # introduced=21

    glProgramUniform4uivEXT; # introduced=21

    glProgramUniformMatrix2fvEXT;

    glProgramUniformMatrix2x3fvEXT; # introduced=21

    glProgramUniformMatrix2x4fvEXT; # introduced=21

    glProgramUniformMatrix3fvEXT;

    glProgramUniformMatrix3x2fvEXT; # introduced=21

    glProgramUniformMatrix3x4fvEXT; # introduced=21

    glProgramUniformMatrix4fvEXT;

    glProgramUniformMatrix4x2fvEXT; # introduced=21

    glProgramUniformMatrix4x3fvEXT; # introduced=21

    glPushGroupMarkerEXT;

    glQueryCounterEXT; # introduced=21

    glRasterSamplesEXT; # introduced=24

    glReadBufferIndexedEXT; # introduced=21

    glReadnPixelsEXT;

    glReadnPixelsKHR; # introduced=24

    glReadPixels;

    glReadPixels;

    glReleaseShaderCompiler;

    glReleaseShaderCompiler;

    glRenderbufferStorage;

    glRenderbufferStorage;

    glRenderbufferStorageMultisampleEXT; # introduced=28

    glRenderbufferStorageMultisampleEXT; # introduced=28

    glRenderbufferStorageMultisampleIMG; # introduced-mips=9 introduced-x86=9

    glRenderbufferStorageMultisampleIMG; # introduced-mips=9 introduced-x86=9

    glSampleCoverage;

    glSampleCoverage;

    glSamplerParameterIivOES; # introduced=24

    glSamplerParameterIuivOES; # introduced=24

    glScissor;

    glScissor;

    glSelectPerfMonitorCountersAMD;

    glSelectPerfMonitorCountersAMD;

    glSetFenceNV;

    glSetFenceNV;
@@ -164,14 +275,27 @@ LIBGLESV2 { 
    glStencilOp;

    glStencilOp;

    glStencilOpSeparate;

    glStencilOpSeparate;

    glTestFenceNV;

    glTestFenceNV;

    glTexBufferOES; # introduced=24

    glTexBufferRangeOES; # introduced=24

    glTexImage2D;

    glTexImage2D;

    glTexImage3DOES;

    glTexImage3DOES;

    glTexPageCommitmentEXT; # introduced=24

    glTexParameterf;

    glTexParameterf;

    glTexParameterfv;

    glTexParameterfv;

    glTexParameteri;

    glTexParameteri;

    glTexParameterIivOES; # introduced=24

    glTexParameterIuivOES; # introduced=24

    glTexParameteriv;

    glTexParameteriv;

    glTexStorage1DEXT;

    glTexStorage2DEXT;

    glTexStorage3DEXT;

    glTexSubImage2D;

    glTexSubImage2D;

    glTexSubImage3DOES;

    glTexSubImage3DOES;

    glTextureStorage1DEXT;

    glTextureStorage2DEXT;

    glTextureStorage3DEXT;

    glTextureViewEXT; # introduced=21

    glTextureViewOES; # introduced=24

    glUniform1f;

    glUniform1f;

    glUniform1fv;

    glUniform1fv;

    glUniform1i;

    glUniform1i;
@@ -193,7 +317,11 @@ LIBGLESV2 { 
    glUniformMatrix4fv;

    glUniformMatrix4fv;

    glUnmapBufferOES;

    glUnmapBufferOES;

    glUseProgram;

    glUseProgram;

    glUseProgramStagesEXT;

    glValidateProgram;

    glValidateProgram;

    glValidateProgramPipelineEXT;

    glVertexAttribDivisorANGLE; # introduced=21

    glVertexAttribDivisorEXT; # introduced=21

    glVertexAttrib1f;

    glVertexAttrib1f;

    glVertexAttrib1fv;

    glVertexAttrib1fv;

    glVertexAttrib2f;

    glVertexAttrib2f;