diff options
| author | Kristian Høgsberg <[email protected]> | 2012-03-16 12:55:40 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2012-03-19 11:13:06 -0400 |
| commit | ca760181b4420696c7e86aa2951d7203522ad1e8 (patch) | |
| tree | 88e11d719bbd0963594645ab4d16c9c051b8eace /src/mapi/Android.mk | |
| parent | 91ddfa72b4384d04e4d84e60b4cdf3efee7ef49b (diff) | |
shared-glapi: Convert to automake
This fixes a build problem where EGL links to libgbm.la, which encodes
a relative path to it's libglapi.so dependency. The relative path
breaks when the linker tries to resolve it from src/egl/main instead
of src/gbm. Typically we silently fall back to the system
libglapi.so, which is wrong and breaks when there isn't one.
Morale of the story: don't mix mklib and libtool.
Diffstat (limited to 'src/mapi/Android.mk')
| -rw-r--r-- | src/mapi/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mapi/Android.mk b/src/mapi/Android.mk index fe9e40e261b..b75361f46fa 100644 --- a/src/mapi/Android.mk +++ b/src/mapi/Android.mk @@ -25,7 +25,7 @@ LOCAL_PATH := $(call my-dir) -# get MAPI_GLAPI_SOURCES +# get MAPI_GLAPI_FILES include $(LOCAL_PATH)/mapi/sources.mak mapi_abi_headers := @@ -38,7 +38,7 @@ include $(CLEAR_VARS) abi_header := shared-glapi/glapi_mapi_tmp.h -LOCAL_SRC_FILES := $(addprefix mapi/, $(MAPI_GLAPI_SOURCES)) +LOCAL_SRC_FILES := $(MAPI_GLAPI_FILES) LOCAL_CFLAGS := \ -DMAPI_MODE_GLAPI \ |