Mesa (master): glsl: move the android build scripts a level up

[Emil Velikov]

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

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Tue Apr  5 14:25:19 2016 +0100

glsl: move the android build scripts a level up

Analogous to previous commit.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Acked-by: Jason Ekstrand <jason at jlekstrand.net>

---

 Android.mk                                                |  1 -
 src/compiler/{glsl/Android.gen.mk => Android.glsl.gen.mk} | 13 +++++++------
 src/compiler/{glsl/Android.mk => Android.glsl.mk}         |  2 +-
 src/compiler/Android.mk                                   |  2 ++
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Android.mk b/Android.mk
index 67d894f..aa4350f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -91,7 +91,6 @@ SUBDIRS := \
 	src/loader \
 	src/mapi \
 	src/compiler \
-	src/compiler/glsl \
 	src/mesa \
 	src/util \
 	src/egl \
diff --git a/src/compiler/glsl/Android.gen.mk b/src/compiler/Android.glsl.gen.mk
similarity index 86%
rename from src/compiler/glsl/Android.gen.mk
rename to src/compiler/Android.glsl.gen.mk
index de5cd0f..b0df8a1 100644
--- a/src/compiler/glsl/Android.gen.mk
+++ b/src/compiler/Android.glsl.gen.mk
@@ -32,8 +32,9 @@ intermediates := $(call local-generated-sources-dir)
 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES)
 
 LOCAL_C_INCLUDES += \
-	$(intermediates)/glcpp \
-	$(LOCAL_PATH)/glcpp \
+	$(intermediates)/glsl \
+	$(LOCAL_PATH)/glsl \
+	$(LOCAL_PATH)/glsl/glcpp \
 
 LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
 	$(LIBGLCPP_GENERATED_FILES) \
@@ -65,14 +66,14 @@ define local-yy-to-cpp-and-h
 	rm -f $(@:$1=$(YACC_HEADER_SUFFIX))
 endef
 
-$(intermediates)/glsl_lexer.cpp: $(LOCAL_PATH)/glsl_lexer.ll
+$(intermediates)/glsl/glsl_lexer.cpp: $(LOCAL_PATH)/glsl/glsl_lexer.ll
 	$(call local-l-or-ll-to-c-or-cpp)
 
-$(intermediates)/glsl_parser.cpp: $(LOCAL_PATH)/glsl_parser.yy
+$(intermediates)/glsl/glsl_parser.cpp: $(LOCAL_PATH)/glsl/glsl_parser.yy
 	$(call local-yy-to-cpp-and-h,.cpp)
 
-$(intermediates)/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glcpp/glcpp-lex.l
+$(intermediates)/glsl/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-lex.l
 	$(call local-l-or-ll-to-c-or-cpp)
 
-$(intermediates)/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glcpp/glcpp-parse.y
+$(intermediates)/glsl/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-parse.y
 	$(call glsl_local-y-to-c-and-h)
diff --git a/src/compiler/glsl/Android.mk b/src/compiler/Android.glsl.mk
similarity index 98%
rename from src/compiler/glsl/Android.mk
rename to src/compiler/Android.glsl.mk
index f5d96b3..d9cf06d 100644
--- a/src/compiler/glsl/Android.mk
+++ b/src/compiler/Android.glsl.mk
@@ -47,7 +47,7 @@ LOCAL_STATIC_LIBRARIES := libmesa_compiler
 
 LOCAL_MODULE := libmesa_glsl
 
-include $(LOCAL_PATH)/Android.gen.mk
+include $(LOCAL_PATH)/Android.glsl.gen.mk
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
diff --git a/src/compiler/Android.mk b/src/compiler/Android.mk
index 888780b..6c3a855 100644
--- a/src/compiler/Android.mk
+++ b/src/compiler/Android.mk
@@ -65,3 +65,5 @@ LOCAL_MODULE := libmesa_nir
 include $(LOCAL_PATH)/Android.gen.mk
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+include $(LOCAL_PATH)/Android.glsl.mk