summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.common.mk1
-rw-r--r--src/gallium/targets/dri/Android.mk7
2 files changed, 8 insertions, 0 deletions
diff --git a/Android.common.mk b/Android.common.mk
index e5416c4e383..25ea8a3c490 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -64,6 +64,7 @@ LOCAL_CFLAGS += \
-DHAVE___BUILTIN_CLZLL \
-DHAVE___BUILTIN_UNREACHABLE \
-DHAVE_PTHREAD=1 \
+ -DHAVE_DLADDR \
-DHAVE_DLOPEN \
-DHAVE_DL_ITERATE_PHDR \
-DMAJOR_IN_SYSMACROS \
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index 96b570ea116..e40288c21b9 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -32,6 +32,13 @@ LOCAL_SRC_FILES := target.c
LOCAL_CFLAGS :=
+# We need --undefined-version as some functions in dri.sym may be missing
+# depending on which drivers are enabled or not. Otherwise, we get the error:
+# "version script assignment of to symbol FOO failed: symbol not defined"
+LOCAL_LDFLAGS := \
+ -Wl,--version-script=$(LOCAL_PATH)/dri.sym \
+ -Wl,--undefined-version
+
LOCAL_SHARED_LIBRARIES := \
libdl \
libglapi \