diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-08-12 22:07:16 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-12 22:07:16 -0700 |
| commit | eb0e35abd8ec368b10ec2026642583ac8b330929 (patch) | |
| tree | e7bbb394482f1c6e180fba854367fae73d13c3d7 | |
| parent | bdbe4b6a5f9e8027f5bfd819e71809f834eba5f9 (diff) | |
| parent | a65ebe4f6f6e38d7d6a7681373971a16d2ef0f34 (diff) | |
| download | sdk-eb0e35abd8ec368b10ec2026642583ac8b330929.zip sdk-eb0e35abd8ec368b10ec2026642583ac8b330929.tar.gz sdk-eb0e35abd8ec368b10ec2026642583ac8b330929.tar.bz2 | |
Merge "Fixed "Bus error" running tests triangleV2 and triangleCM"
| -rw-r--r-- | emulator/opengl/tests/translator_tests/GLES_CM/Android.mk | 10 | ||||
| -rw-r--r-- | emulator/opengl/tests/translator_tests/GLES_V2/Android.mk | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk b/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk index bce56e3..a66207e 100644 --- a/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk +++ b/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk @@ -9,9 +9,13 @@ LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags) LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs)) ifeq ($(HOST_OS),darwin) - # OS X 10.6+ needs to be forced to link dylib to avoid problems - # with the dynamic function lookups in SDL 1.2 - LOCAL_SDL_LDLIBS += /usr/lib/dylib1.o + # SDK 10.6+ deprecates __dyld_func_lookup required by dlcompat_init_func + # in SDL_dlcompat.o this module depends. Instruct linker to resolved it at runtime. + OSX_VERSION_MAJOR := $(shell echo $(mac_sdk_version) | cut -d . -f 2) + OSX_VERSION_MAJOR_GREATER_THAN_OR_EQUAL_TO_6 := $(shell [ $(OSX_VERSION_MAJOR) -ge 6 ] && echo true) + ifeq ($(OSX_VERSION_MAJOR_GREATER_THAN_OR_EQUAL_TO_6),true) + LOCAL_SDL_LDLIBS += -Wl,-undefined,dynamic_lookup + endif endif LOCAL_SRC_FILES:= \ diff --git a/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk b/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk index 504530f..e72da96 100644 --- a/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk +++ b/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk @@ -17,9 +17,13 @@ LOCAL_LDLIBS += $(LOCAL_SDL_LDLIBS) LOCAL_STATIC_LIBRARIES += libSDL libSDLmain ifeq ($(HOST_OS),darwin) - # OS X 10.6+ needs to be forced to link dylib to avoid problems - # with the dynamic function lookups in SDL 1.2 - LOCAL_LDLIBS += /usr/lib/dylib1.o + # SDK 10.6+ deprecates __dyld_func_lookup required by dlcompat_init_func + # in SDL_dlcompat.o this module depends. Instruct linker to resolved it at runtime. + OSX_VERSION_MAJOR := $(shell echo $(mac_sdk_version) | cut -d . -f 2) + OSX_VERSION_MAJOR_GREATER_THAN_OR_EQUAL_TO_6 := $(shell [ $(OSX_VERSION_MAJOR) -ge 6 ] && echo true) + ifeq ($(OSX_VERSION_MAJOR_GREATER_THAN_OR_EQUAL_TO_6),true) + LOCAL_LDLIBS += -Wl,-undefined,dynamic_lookup + endif $(call emugl-import,libMac_view) endif |