Mesa (master): build/glsl: fix android build v2

Matt Turner mattst88 at kemper.freedesktop.org
Thu Aug 23 17:14:36 UTC 2012


Module: Mesa
Branch: master
Commit: 2ddfca98378a1eb4044e8e9d7168d73443709068
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ddfca98378a1eb4044e8e9d7168d73443709068

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Fri Aug 17 10:32:53 2012 +0300

build/glsl: fix android build v2

Commit 77a3efc6b907943903190b385fdf107c4acfcdca broke android build that
sets its own value for GLSL_SRCDIR before including Makefile.sources.
Patch moves overriding the value after include, this works as GLSL_SRCDIR
variable gets expanded only later.

Reviewed-by: Matt Turner <mattst88 at gmail.com>
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/glsl/Android.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index 66c8bec..87a02f5 100644
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -25,9 +25,9 @@
 
 LOCAL_PATH := $(call my-dir)
 
-GLSL_SRCDIR = .
 include $(LOCAL_PATH)/Makefile.sources
 
+GLSL_SRCDIR = .
 # ---------------------------------------
 # Build libmesa_glsl
 # ---------------------------------------




More information about the mesa-commit mailing list