diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-15 16:12:10 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-15 16:12:10 -0800 |
| commit | 9266c558bf1d21ff647525ff99f7dadbca417309 (patch) | |
| tree | 1630b1ba80f4793caf39d865528e662bdb1037fe /opengl | |
| parent | b798689749c64baba81f02e10cf2157c747d6b46 (diff) | |
| download | frameworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.zip frameworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.tar.gz frameworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.tar.bz2 | |
auto import from //branches/cupcake/...@126645
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libGLES_CM/Android.mk | 4 | ||||
| -rw-r--r-- | opengl/libGLES_CM/gl_wrapper.cpp | 3 | ||||
| -rw-r--r-- | opengl/libagl/Android.mk | 5 |
3 files changed, 10 insertions, 2 deletions
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 <bionic_tls.h> + 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 <sys/tls.h> +/* special private C library header */ +#include <bionic_tls.h> // 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 <bionic_tls.h> + LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private +endif + LOCAL_SHARED_LIBRARIES := libcutils libutils libpixelflinger LOCAL_LDLIBS := -lpthread -ldl LOCAL_MODULE:= libagl |