diff options
| author | Elliott Hughes <enh@google.com> | 2013-02-14 11:42:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-14 11:42:06 -0800 |
| commit | bbb7322c363d1ff98b09ec4ad95338cc82eb86b0 (patch) | |
| tree | cd864aefb9a87e932d0e9cfb6d8be261a602e7f0 /opengl/libs/GLES_trace | |
| parent | 36ebf51a1b4e8a12092ea7b1dd7857bc7a173891 (diff) | |
| parent | 45b0e4350d3404bd194edc569e36ecca017c3d76 (diff) | |
| download | frameworks_native-bbb7322c363d1ff98b09ec4ad95338cc82eb86b0.zip frameworks_native-bbb7322c363d1ff98b09ec4ad95338cc82eb86b0.tar.gz frameworks_native-bbb7322c363d1ff98b09ec4ad95338cc82eb86b0.tar.bz2 | |
am 45b0e435: Merge "Simplify OpenGL TLS access on ARM."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '45b0e4350d3404bd194edc569e36ecca017c3d76':
Simplify OpenGL TLS access on ARM.
Diffstat (limited to 'opengl/libs/GLES_trace')
| -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 |