[Mesa-dev] [PATCH] android: add megadriver_stub

Adrian Negreanu groleo at gmail.com
Mon Oct 28 09:07:44 CET 2013


From: Adrian Negreanu <adrian.m.negreanu at intel.com>

Fixes linker error:
  ld: .../libmesa_dri_common_intermediates/libmesa_dri_common.a(dri_util.o):
  in function globalDriverAPI:dri_util.c(.data.rel+0x0): error: undefined
  reference to 'driDriverAPI'

Signed-off-by: Adrian Negreanu <adrian.m.negreanu at intel.com>
---
 src/mesa/drivers/dri/Android.mk              |  1 +
 src/mesa/drivers/dri/common/Android.mk       | 18 ++++++++++++++++++
 src/mesa/drivers/dri/common/Makefile.sources |  2 ++
 3 files changed, 21 insertions(+)

diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
index 9adf0b3..54dc02d 100644
--- a/src/mesa/drivers/dri/Android.mk
+++ b/src/mesa/drivers/dri/Android.mk
@@ -44,6 +44,7 @@ MESA_DRI_C_INCLUDES := \
 MESA_DRI_WHOLE_STATIC_LIBRARIES := \
 	libmesa_glsl \
 	libmesa_dri_common \
+	libmegadriver_stub \
 	libmesa_dricore
 
 MESA_DRI_SHARED_LIBRARIES := \
diff --git a/src/mesa/drivers/dri/common/Android.mk b/src/mesa/drivers/dri/common/Android.mk
index b3dac29..7930e7b 100644
--- a/src/mesa/drivers/dri/common/Android.mk
+++ b/src/mesa/drivers/dri/common/Android.mk
@@ -86,3 +86,21 @@ $(intermediates)/xmlpool/options.h: $$(PRIVATE_SCRIPT) $$(PRIVATE_TEMPLATE_HEADE
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+
+
+#
+# Build libmegadriver_stub
+#
+include $(CLEAR_VARS)
+include $(LOCAL_PATH)/Makefile.sources
+
+LOCAL_MODULE := libmegadriver_stub
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_C_INCLUDES := \
+    $(MESA_DRI_C_INCLUDES)
+
+LOCAL_SRC_FILES := $(libmegadriver_stub_SOURCES)
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/src/mesa/drivers/dri/common/Makefile.sources b/src/mesa/drivers/dri/common/Makefile.sources
index 040b717..7161e63 100644
--- a/src/mesa/drivers/dri/common/Makefile.sources
+++ b/src/mesa/drivers/dri/common/Makefile.sources
@@ -14,3 +14,5 @@ mesa_dri_common_INCLUDES := \
 	src/mapi \
 	src/mesa \
 	src/mesa/drivers/dri/common
+
+libmegadriver_stub_SOURCES = megadriver_stub.c
-- 
1.8.0



More information about the mesa-dev mailing list