diff options
| author | Elliott Hughes <enh@google.com> | 2013-02-13 17:30:54 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-02-13 17:30:54 -0800 |
| commit | 288870ebc3da8121b7a237a53280bd8b931b7a2f (patch) | |
| tree | b5c73c8ed31a810b18e62da2e33f2948b09867f5 /opengl/libs/GLES_trace/Android.mk | |
| parent | 873ab60e94811488caea1906eb98133329a3e28f (diff) | |
| download | frameworks_native-288870ebc3da8121b7a237a53280bd8b931b7a2f.zip frameworks_native-288870ebc3da8121b7a237a53280bd8b931b7a2f.tar.gz frameworks_native-288870ebc3da8121b7a237a53280bd8b931b7a2f.tar.bz2 | |
Simplify OpenGL TLS access on ARM.
bionic now assumes the TLS register is available, so OpenGL can too.
Change-Id: If2b56a4c08de9f887759b78f70022026a181dc47
Diffstat (limited to 'opengl/libs/GLES_trace/Android.mk')
| -rw-r--r-- | opengl/libs/GLES_trace/Android.mk | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/opengl/libs/GLES_trace/Android.mk b/opengl/libs/GLES_trace/Android.mk index 465b6b2..9dec020 100644 --- a/opengl/libs/GLES_trace/Android.mk +++ b/opengl/libs/GLES_trace/Android.mk @@ -24,18 +24,9 @@ LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI LOCAL_STATIC_LIBRARIES := libprotobuf-cpp-2.3.0-lite liblzf LOCAL_SHARED_LIBRARIES := libcutils libutils libstlport -ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true) - LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER -endif - LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_trace\" # we need to access the private Bionic header <bionic_tls.h> -# on ARM platforms, we need to mirror the ARCH_ARM_HAVE_TLS_REGISTER -# behavior from the bionic Android.mk file -ifeq ($(TARGET_ARCH)-$(ARCH_ARM_HAVE_TLS_REGISTER),arm-true) - LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER -endif LOCAL_C_INCLUDES += bionic/libc/private LOCAL_MODULE:= libGLES_trace |