From a2f16db19b18bcb0e00702b17adc84483c17c590 Mon Sep 17 00:00:00 2001
From: Rob Herring <robh@kernel.org>
Date: Wed, 24 Feb 2016 12:56:25 -0600
Subject: [PATCH] Android: glsl: fix dependence on YACC_HEADER_SUFFIX from
 build system

The makefile was implicitly picking up YACC_HEADER_SUFFIX from the Android
build system, but this variable is now gone. Add it locally to fix the
build with AOSP master.

Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
 src/compiler/glsl/Android.gen.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/compiler/glsl/Android.gen.mk b/src/compiler/glsl/Android.gen.mk
index c0902b27f32..de5cd0f474c 100644
--- a/src/compiler/glsl/Android.gen.mk
+++ b/src/compiler/glsl/Android.gen.mk
@@ -51,6 +51,8 @@ define glsl_local-y-to-c-and-h
 	$(hide) $(YACC) -o $@ -p "glcpp_parser_" $<
 endef
 
+YACC_HEADER_SUFFIX := .hpp
+
 define local-yy-to-cpp-and-h
 	@mkdir -p $(dir $@)
 	@echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<"
-- 
2.30.2