Move packaging of glsl2 and shader test files to

tests/spec/glsl-es-1.00/compiler/Android.mk

2 files changed, 36 insertions, 35 deletions

diff --git a/tests/glslparsertest/Android.mk b/tests/glslparsertest/Android.mk
index 70bb2db9..b6d24f2d 100644
--- a/tests/glslparsertest/Android.mk
+++ b/tests/glslparsertest/Android.mk
@@ -20,38 +20,3 @@ systemtarball: glslparsertest_gles2
 LOCAL_SRC_FILES := glslparsertest.c
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)/piglit/glslparsertest
 include $(BUILD_EXECUTABLE)
-
-define all-vert-frag-files-under
-$(patsubst ./%,%, \
-  $(shell cd $(1) ; \
-    find $(2) -name "*.vert" -or -name "*.frag" -and -not -name ".*" -printf "%P\n" ) \
-   )
-endef
-
-define glsl2_add_test_data
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := glsl2/$1
-LOCAL_MODULE:= $1
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_CLASS := data
-LOCAL_MODULE_PATH:=$(TARGET_OUT_DATA)/glslparser-data/glsl2
-datatarball: $1
-include $(BUILD_PREBUILT)
-endef
-
-glsl2_files := $(call all-vert-frag-files-under, external/piglit/tests/glslparsertest/glsl2)
-$(foreach item,$(glsl2_files),$(eval $(call glsl2_add_test_data,$(item))))
-
-define shaders_add_test_data
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := shaders/$1
-LOCAL_MODULE:= $1
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_CLASS := data
-LOCAL_MODULE_PATH:=$(TARGET_OUT_DATA)/glslparser-data/shaders
-datatarball: $1
-include $(BUILD_PREBUILT)
-endef
-
-shader_files := $(call all-vert-frag-files-under, external/piglit/tests/glslparsertest/shaders)
-$(foreach item,$(shader_files),$(eval $(call shaders_add_test_data,$(item))))
diff --git a/tests/spec/glsl-es-1.00/compiler/Android.mk b/tests/spec/glsl-es-1.00/compiler/Android.mk
new file mode 100644
index 00000000..726f2fde
--- /dev/null
+++ b/tests/spec/glsl-es-1.00/compiler/Android.mk
@@ -0,0 +1,36 @@
+LOCAL_PATH:= $(call my-dir)
+
+define all-vert-frag-files-under
+$(patsubst ./%,%, \
+  $(shell cd $(1) ; \
+    find $(2)  -regex ".*\.\(vert\|frag\)" -printf "%P\n" ) \
+   )
+endef
+
+define glsl2_add_test_data
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := glsl2/$1
+LOCAL_MODULE:= $1
+LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_CLASS := data
+LOCAL_MODULE_PATH:=$(TARGET_OUT_DATA)/glslparser-data/glsl2
+datatarball: $1
+include $(BUILD_PREBUILT)
+endef
+
+glsl2_files := $(call all-vert-frag-files-under, external/piglit/tests/spec/glsl-es-1.00/compiler/glsl2)
+$(foreach item,$(glsl2_files),$(eval $(call glsl2_add_test_data,$(item))))
+
+define shaders_add_test_data
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := shaders/$1
+LOCAL_MODULE:= $1
+LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_CLASS := data
+LOCAL_MODULE_PATH:=$(TARGET_OUT_DATA)/glslparser-data/shaders
+datatarball: $1
+include $(BUILD_PREBUILT)
+endef
+
+shader_files := $(call all-vert-frag-files-under, external/piglit/tests/spec/glsl-es-1.00/compiler/shaders)
+$(foreach item,$(shader_files),$(eval $(call shaders_add_test_data,$(item))))