On Fri, Aug 17, 2012 at 12:32 AM, Tapani Pälli <tapani.pa...@intel.com> wrote: > 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. > > Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> > --- > src/glsl/Android.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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 > # --------------------------------------- > -- > 1.7.11.4
This looks fine to me. Committed. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
