aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/loader
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-08-22 21:57:21 +0200
committermarha <marha@users.sourceforge.net>2014-08-22 21:57:21 +0200
commit112d89481850102f28b6e7ff4f40b65c41e11f6c (patch)
tree9e22963aeda3f588d4aa3aa270fdba74922028c7 /mesalib/src/loader
parentbcb354180f20f0c410a77bd32cbf2c1e799632d5 (diff)
parent6c0c95d6045d2d2b4e6a3a2f11457850031c57bc (diff)
downloadvcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.tar.gz
vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.tar.bz2
vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/loader')
-rwxr-xr-xmesalib/src/loader/Android.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/mesalib/src/loader/Android.mk b/mesalib/src/loader/Android.mk
index 6890af473..8daeedf5d 100755
--- a/mesalib/src/loader/Android.mk
+++ b/mesalib/src/loader/Android.mk
@@ -25,7 +25,7 @@ LOCAL_PATH := $(call my-dir)
include $(LOCAL_PATH)/Makefile.sources
# ---------------------------------------
-# Build libloader
+# Build libmesa_loader
# ---------------------------------------
include $(CLEAR_VARS)
@@ -35,14 +35,12 @@ LOCAL_SRC_FILES := \
# swrast only
ifeq ($(MESA_GPU_DRIVERS),swrast)
- LOCAL_CFLAGS += -D__NOT_HAVE_DRM_H
+LOCAL_CFLAGS += -D__NOT_HAVE_DRM_H
else
-LOCAL_C_INCLUDES += \
- $(DRM_TOP)/include/drm \
- $(DRM_TOP)
+LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm
endif
-LOCAL_MODULE := libloader
+LOCAL_MODULE := libmesa_loader
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)