Mesa (master): glsl: android: add back missing generated glcpp include path

Emil Velikov evelikov at kemper.freedesktop.org
Thu Apr 21 13:40:40 UTC 2016


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

Author: Rob Herring <robh at kernel.org>
Date:   Thu Apr 14 14:40:56 2016 -0500

glsl: android: add back missing generated glcpp include path

Commit 4db8f15a2576 ("glsl: move the android build scripts a level up")
dropped a generated include path for glcpp. Add it back adjusting for the
new location.

Signed-off-by: Rob Herring <robh at kernel.org>
Tested-by: Chih-Wei Huang <cwhuang at linux.org.tw>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/compiler/Android.glsl.gen.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk
index b0df8a1..b2ea12c 100644
--- a/src/compiler/Android.glsl.gen.mk
+++ b/src/compiler/Android.glsl.gen.mk
@@ -33,6 +33,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES)
 
 LOCAL_C_INCLUDES += \
 	$(intermediates)/glsl \
+	$(intermediates)/glsl/glcpp \
 	$(LOCAL_PATH)/glsl \
 	$(LOCAL_PATH)/glsl/glcpp \
 




More information about the mesa-commit mailing list