am 24af5e0a: Merge "Translator: fix eglGetProcAddress() on Linux"

* commit '24af5e0a4aeacb59e34dbae5fc01fe2ba95df4d2':
  Translator: fix eglGetProcAddress() on Linux
This commit is contained in:
David Turner
2011-07-06 07:29:24 -07:00
committed by Android Git Automerger
2 changed files with 3 additions and 1 deletions

View File

@@ -8,7 +8,7 @@ OS_SRCS:=
ifeq ($(HOST_OS),linux)
OS_SRCS = EglX11Api.cpp
LOCAL_LDLIBS += -lX11 -lGL -ldl -lpthread
LOCAL_LDLIBS += -lX11 -lGL -ldl -lpthread
endif
ifeq ($(HOST_OS),darwin)

View File

@@ -22,6 +22,8 @@ LOCAL_SRC_FILES := \
ifeq ($(HOST_OS),linux)
# $(call emugl-export,LDFLAGS,-Wl,--whole-archive)
$(call emugl-export,LDLIBS,-lGL -ldl)
GL_COMMON_LINKER_FLAGS := -Wl,-Bsymbolic
$(call emugl-export,LDFLAGS,$(GL_COMMON_LINKER_FLAGS))
endif
ifeq ($(HOST_OS),windows)