From: Tapani Pälli <tapani.palli@intel.com>
Date: Fri, 17 Aug 2012 07:32:53 +0000 (+0300)
Subject: build/glsl: fix android build v2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2ddfca98378a1eb4044e8e9d7168d73443709068;p=mesa.git

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@gmail.com>
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
---

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index 66c8bec3297..87a02f51b8c 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
 # ---------------------------------------