From 9266c558bf1d21ff647525ff99f7dadbca417309 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Thu, 15 Jan 2009 16:12:10 -0800 Subject: auto import from //branches/cupcake/...@126645 --- opengl/libGLES_CM/Android.mk | 4 +++- opengl/libGLES_CM/gl_wrapper.cpp | 3 ++- opengl/libagl/Android.mk | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'opengl') diff --git a/opengl/libGLES_CM/Android.mk b/opengl/libGLES_CM/Android.mk index a0081ef..e350e02 100644 --- a/opengl/libGLES_CM/Android.mk +++ b/opengl/libGLES_CM/Android.mk @@ -15,7 +15,9 @@ LOCAL_MODULE:= libGLES_CM # needed on sim build because of weird logging issues ifeq ($(TARGET_SIMULATOR),true) else - LOCAL_SHARED_LIBRARIES += libdl + LOCAL_SHARED_LIBRARIES += libdl + # we need to access the Bionic private header + LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private endif include $(BUILD_SHARED_LIBRARY) diff --git a/opengl/libGLES_CM/gl_wrapper.cpp b/opengl/libGLES_CM/gl_wrapper.cpp index 3b7f45e..3197535 100644 --- a/opengl/libGLES_CM/gl_wrapper.cpp +++ b/opengl/libGLES_CM/gl_wrapper.cpp @@ -203,7 +203,8 @@ static pthread_key_t gEGLThreadLocalStorageKey = -1; #if defined(HAVE_ANDROID_OS) && !USE_SLOW_BINDING && !GL_LOGGER -#include +/* special private C library header */ +#include // We have a dedicated TLS slot in bionic static inline void setGlThreadSpecific(gl_hooks_t const *value) { ((uint32_t *)__get_tls())[TLS_SLOT_OPENGL_API] = (uint32_t)value; diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk index a3dff76..99efe4c 100644 --- a/opengl/libagl/Android.mk +++ b/opengl/libagl/Android.mk @@ -27,6 +27,11 @@ ifeq ($(TARGET_ARCH),arm) LOCAL_CFLAGS += -fstrict-aliasing endif +ifneq ($(TARGET_SIMULATOR),true) + # we need to access the private Bionic header + LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private +endif + LOCAL_SHARED_LIBRARIES := libcutils libutils libpixelflinger LOCAL_LDLIBS := -lpthread -ldl LOCAL_MODULE:= libagl -- cgit v1.1