summaryrefslogtreecommitdiffstats
path: root/src/glsl/Android.mk
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2012-08-17 10:32:53 +0300
committerMatt Turner <mattst88@gmail.com>2012-08-23 10:13:38 -0700
commit2ddfca98378a1eb4044e8e9d7168d73443709068 (patch)
tree98f97c76090a39c1844c4780b059760ac97cf169 /src/glsl/Android.mk
parenta6b8b709cdc280d3dc77cd9f78654726132d22bb (diff)
downloadexternal_mesa3d-2ddfca98378a1eb4044e8e9d7168d73443709068.zip
external_mesa3d-2ddfca98378a1eb4044e8e9d7168d73443709068.tar.gz
external_mesa3d-2ddfca98378a1eb4044e8e9d7168d73443709068.tar.bz2
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>
Diffstat (limited to 'src/glsl/Android.mk')
-rw-r--r--src/glsl/Android.mk2
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
# ---------------------------------------