summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2015-11-18 13:07:53 +0100
committerBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2015-11-18 13:07:53 +0100
commitedb6d2af69251372f774e95f01bcb4e0095d11d0 (patch)
tree72f610767350bd4c5ba6401449228dc371810ddb
parent3df6a76d76512f4022bacdc3a7e8f6b0bd60601f (diff)
downloaddrm_gralloc-master.tar.gz
Update Mesa locationHEADmaster
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--Android.mk12
-rw-r--r--README.linaro2
2 files changed, 8 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index 1a64993..39a4f4a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -96,12 +96,12 @@ LOCAL_SHARED_LIBRARIES := \
ifneq ($(filter $(freedreno_drivers), $(DRM_GPU_DRIVERS)),)
LOCAL_SRC_FILES += gralloc_drm_pipe.c
LOCAL_C_INCLUDES += \
- hardware/mesa/include \
- hardware/mesa/src \
- hardware/mesa/src/gallium/include \
- hardware/mesa/src/gallium/winsys \
- hardware/mesa/src/gallium/drivers \
- hardware/mesa/src/gallium/auxiliary
+ external/mesa3d/include \
+ external/mesa3d/src \
+ external/mesa3d/src/gallium/include \
+ external/mesa3d/src/gallium/winsys \
+ external/mesa3d/src/gallium/drivers \
+ external/mesa3d/src/gallium/auxiliary
LOCAL_CFLAGS += -DENABLE_PIPE -DDMABUF
LOCAL_SHARED_LIBRARIES += libdl
endif
diff --git a/README.linaro b/README.linaro
index 2f4c016..4fd52c6 100644
--- a/README.linaro
+++ b/README.linaro
@@ -3,3 +3,5 @@ https://github.com/robclark/drm_gralloc.git
Changes:
- Make it build inside Marshmallow
+- Update Mesa location - it lives in external/mesa3d in Marshmallow upstream,
+ let's keep it there