diff options
| author | 2011-07-12 12:15:07 -0700 | |
|---|---|---|
| committer | 2011-07-12 12:15:07 -0700 | |
| commit | 71753982479b9a68e36d43fbb58de0331ea5797c (patch) | |
| tree | 3261a0523f462502f8b6d8248a43536296ef4ffc /opengl/libagl/Android.mk | |
| parent | f8ff03d96d343ce4c78b701f2641cc6813c5d12c (diff) | |
| parent | baa44b89ec159fd65230cbb8ebab62d63a513b0b (diff) | |
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
Diffstat (limited to 'opengl/libagl/Android.mk')
| -rw-r--r-- | opengl/libagl/Android.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk index b5c018f462..15e58f2f6a 100644 --- a/opengl/libagl/Android.mk +++ b/opengl/libagl/Android.mk @@ -38,15 +38,13 @@ 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> - # 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 +# 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_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl LOCAL_MODULE:= libGLES_android |