diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:16 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:16 -0700 |
| commit | bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e (patch) | |
| tree | b17fbae7a6ff475ab37be48046d0540d594f84fb /opengl/libs/GLES2_dbg | |
| parent | 3f9dd287b99340efaaa257759e71a8f81b2ed113 (diff) | |
| download | frameworks_base-bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e.zip frameworks_base-bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e.tar.gz frameworks_base-bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e.tar.bz2 | |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
Diffstat (limited to 'opengl/libs/GLES2_dbg')
| -rw-r--r-- | opengl/libs/GLES2_dbg/Android.mk | 14 | ||||
| -rw-r--r-- | opengl/libs/GLES2_dbg/test/Android.mk | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/opengl/libs/GLES2_dbg/Android.mk b/opengl/libs/GLES2_dbg/Android.mk index 9f6e68c..c2b1142 100644 --- a/opengl/libs/GLES2_dbg/Android.mk +++ b/opengl/libs/GLES2_dbg/Android.mk @@ -31,15 +31,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:= libGLESv2_dbg LOCAL_MODULE_TAGS := optional diff --git a/opengl/libs/GLES2_dbg/test/Android.mk b/opengl/libs/GLES2_dbg/test/Android.mk index 14a84b4..8708d43 100644 --- a/opengl/libs/GLES2_dbg/test/Android.mk +++ b/opengl/libs/GLES2_dbg/test/Android.mk @@ -27,9 +27,7 @@ LOCAL_MODULE:= libGLESv2_dbg_test ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true) LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER endif -ifneq ($(TARGET_SIMULATOR),true) - LOCAL_C_INCLUDES += bionic/libc/private -endif +LOCAL_C_INCLUDES += bionic/libc/private LOCAL_CFLAGS += -DLOG_TAG=\"libEGL\" LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES |