Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 1289 into donut

Browse Source 
* changes:
  only export the GL entry-points, hide everything else.
This commit is contained in:
Android (Google) Code Review
2009-05-08 15:51:01 -07:00
parent 851a54143c cb29e6237d
commit 3a04bd324a
5 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opengl/include/GLES/glext.h
View File

@@ -603,13 +603,13 @@ typedef void (GL_APIENTRYP PFNGLGETTEXGENXVOESPROC) (GLenum coord, GLenum pname,
* dalvik extension functions * dalvik extension functions
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
#ifdef ANDROID #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); 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); 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); 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); GLsizei stride, const GLvoid *pointer, GLsizei count);
#endif #endif

2
opengl/include/KHR/khrplatform.h
View File

@@ -91,6 +91,8 @@
# define KHRONOS_APICALL __declspec(dllimport) # define KHRONOS_APICALL __declspec(dllimport)
#elif defined (__SYMBIAN32__) #elif defined (__SYMBIAN32__)
# define KHRONOS_APICALL IMPORT_C # define KHRONOS_APICALL IMPORT_C
#elif defined(ANDROID)
# define KHRONOS_APICALL __attribute__((visibility("default")))
#else #else
# define KHRONOS_APICALL # define KHRONOS_APICALL
#endif #endif

2
opengl/libagl/Android.mk
View File

@@ -33,6 +33,8 @@ ifneq ($(TARGET_SIMULATOR),true)
endif endif
LOCAL_SHARED_LIBRARIES := libcutils libutils libpixelflinger LOCAL_SHARED_LIBRARIES := libcutils libutils libpixelflinger
LOCAL_CFLAGS += -fvisibility=hidden
LOCAL_LDLIBS := -lpthread -ldl LOCAL_LDLIBS := -lpthread -ldl
LOCAL_MODULE:= libagl LOCAL_MODULE:= libagl

4
opengl/libs/Android.mk
View File

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

2
opengl/libs/egl_impl.h
View File

@@ -20,6 +20,8 @@
#include <ctype.h> #include <ctype.h>
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h>
#include <EGL/eglplatform.h>
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
namespace android { namespace android {