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

Commit f241d55c authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 1289 into donut 

* changes:
  only export the GL entry-points, hide everything else.
parents 4047ff2c 48685c45

opengl/include/GLES/glext.h

+4 −4
Original line number Diff line number Diff line
@@ -603,13 +603,13 @@ typedef void (GL_APIENTRYP PFNGLGETTEXGENXVOESPROC) (GLenum coord, GLenum pname, 
 * dalvik extension functions

 *------------------------------------------------------------------------*/

#ifdef ANDROID

void glColorPointerBounds(GLint size, GLenum type, GLsizei stride,

GL_API void GL_APIENTRY glColorPointerBounds(GLint size, GLenum type, GLsizei stride,

        const GLvoid *ptr, GLsizei count);

void glNormalPointerBounds(GLenum type, GLsizei stride,

GL_API void GL_APIENTRY glNormalPointerBounds(GLenum type, GLsizei stride,

        const GLvoid *pointer, GLsizei count);

void glTexCoordPointerBounds(GLint size, GLenum type,

GL_API void GL_APIENTRY glTexCoordPointerBounds(GLint size, GLenum type,

        GLsizei stride, const GLvoid *pointer, GLsizei count);

void glVertexPointerBounds(GLint size, GLenum type,

GL_API void GL_APIENTRY glVertexPointerBounds(GLint size, GLenum type,

        GLsizei stride, const GLvoid *pointer, GLsizei count);

#endif

opengl/include/KHR/khrplatform.h

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ 
#   define KHRONOS_APICALL __declspec(dllimport)

#elif defined (__SYMBIAN32__)

#   define KHRONOS_APICALL IMPORT_C

#elif defined(ANDROID)

#   define KHRONOS_APICALL __attribute__((visibility("default")))

#else

#   define KHRONOS_APICALL

#endif

opengl/libagl/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ ifneq ($(TARGET_SIMULATOR),true) 
endif



LOCAL_SHARED_LIBRARIES := libcutils libutils libpixelflinger

LOCAL_CFLAGS += -fvisibility=hidden



LOCAL_LDLIBS := -lpthread -ldl

LOCAL_MODULE:= libagl

opengl/libs/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ else 
    LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private

endif



LOCAL_CFLAGS += -fvisibility=hidden



include $(BUILD_SHARED_LIBRARY)
@@ -49,4 +51,6 @@ else 
    LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private

endif



LOCAL_CFLAGS += -fvisibility=hidden



include $(BUILD_SHARED_LIBRARY)

opengl/libs/egl_impl.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include <ctype.h>



#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <EGL/eglplatform.h>



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

namespace android {