diff options
| author | Mathias Agopian <pixelflinger@google.com> | 2010-05-10 20:28:02 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-05-10 20:28:02 -0700 |
| commit | 06d0e59a434b7cb58b97b6dab24988dcc901c8c7 (patch) | |
| tree | 50740e89ddd8d636156fcc1985e0704c9332f875 /opengl | |
| parent | 954cbf5b7f2c659a4c6842f22ccbb48afe14ab60 (diff) | |
| parent | f123ec8f7d449b2e079ea8d5d7e431ff83235f56 (diff) | |
| download | frameworks_base-06d0e59a434b7cb58b97b6dab24988dcc901c8c7.zip frameworks_base-06d0e59a434b7cb58b97b6dab24988dcc901c8c7.tar.gz frameworks_base-06d0e59a434b7cb58b97b6dab24988dcc901c8c7.tar.bz2 | |
Merge "Build software AGL library with correct get_tls() macro for ARMv7 based platforms"
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk index 9837845..518be8b 100644 --- a/opengl/libagl/Android.mk +++ b/opengl/libagl/Android.mk @@ -37,6 +37,10 @@ ifeq ($(TARGET_ARCH),arm) LOCAL_CFLAGS += -fstrict-aliasing endif +ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true) + LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER +endif + ifneq ($(TARGET_SIMULATOR),true) # we need to access the private Bionic header <bionic_tls.h> LOCAL_C_INCLUDES += bionic/libc/private |