summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nouveau
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-07-20 21:18:34 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-08-25 23:33:31 +0100
commit8cb517e43a16814537668bd8cf072989c328e2c6 (patch)
tree401af248e91050f2a4de58ca8e239ffec96101e1 /src/gallium/drivers/nouveau
parentcdfc7c6c740cb72a85bd4b8ec517ef5488ae2f1a (diff)
android: gallium/nouveau: fix include folders, link against libstlport
nouveau uses STL for a while now thus we need to include external/stlport/libstlport.mk in order to get the build at least partially working. v2: Use the installed libdrm headers over the DRM_TOP ones. Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> (cherry picked from commit 6b510c63383a421eabe0d6e7b0249dbab85cffde)
Diffstat (limited to 'src/gallium/drivers/nouveau')
-rw-r--r--src/gallium/drivers/nouveau/Android.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gallium/drivers/nouveau/Android.mk b/src/gallium/drivers/nouveau/Android.mk
index 5275aa60157..5870aa04b99 100644
--- a/src/gallium/drivers/nouveau/Android.mk
+++ b/src/gallium/drivers/nouveau/Android.mk
@@ -28,18 +28,19 @@ include $(LOCAL_PATH)/Makefile.sources
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(C_SOURCES) \
+LOCAL_SRC_FILES := \
+ $(C_SOURCES) \
$(NV30_C_SOURCES) \
$(NV50_CODEGEN_SOURCES) \
$(NV50_C_SOURES) \
$(NVC0_CODEGEN_SOURCES) \
$(NVC0_C_SOURCES)
-LOCAL_C_INCLUDES := $(DRM_TOP) \
- $(DRM_TOP)/include/drm \
- $(DRM_TOP)/nouveau
+LOCAL_C_INCLUDES := \
+ $(TARGET_OUT_HEADERS)/libdrm
LOCAL_MODULE := libmesa_pipe_nouveau
+include external/stlport/libstlport.mk
include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)