use product.mk to control what will be integratedlinaro-armv8

use PRODUCT_PACKAGES and PRODUCT_COPY_FILES to control the module
and files we want to integrated into the image.

Change-Id: I3fd1ef168f7e613a7e9ddb10a92305e43526d36c
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

11 files changed, 40 insertions, 156 deletions

diff --git a/product.mk b/product.mk
new file mode 100644
index 000000000..d11596fda
--- /dev/null
+++ b/product.mk
@@ -0,0 +1,35 @@
+#############################################################################
+# Copyright (c) 2014 Linaro
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Linaro <linaro-dev@lists.linaro.org>
+#############################################################################
+
+# pick up tests for inclusion in the system image
+PRODUCT_PACKAGES += \
+    minmax_gles2 \
+    glsl-fs-pointcoord_gles2 \
+    multiple-shader-objects_gles2 \
+    drawarrays-vertexid_gles3 \
+    minmax_gles3 \
+    oes_compressed_etc2_texture-miptree_gles3 \
+    texture-immutable-levels_gles3 \
+    libpiglitutil \
+    shader_runner \
+    glslparsertest \
+
+
+# put audio codec test script and media files on the device filesystem
+PRODUCT_COPY_FILES += \
+	$(call find-copy-subdir-files,*.ktx,external/piglit/tests/spec/gles-3.0,data/piglit/tests/spec/gles-3.0) \
+	$(call find-copy-subdir-files,*.vert,external/piglit/tests/spec/glsl-es-1.00/compiler,data/piglit/glslparser/glsl-es-1.00/compiler) \
+	$(call find-copy-subdir-files,*.frag,external/piglit/tests/spec/glsl-es-1.00/compiler,data/piglit/glslparser/glsl-es-1.00/compiler) \
+	$(call find-copy-subdir-files,*.vert,external/piglit/tests/spec/glsl-es-3.00/compiler,data/piglit/glslparser/glsl-es-3.00/compiler) \
+	$(call find-copy-subdir-files,*.frag,external/piglit/tests/spec/glsl-es-3.00/compiler,data/piglit/glslparser/glsl-es-3.00/compiler) \
+	$(call find-copy-subdir-files,*.shader_test,external/piglit/tests/spec/glsl-es-1.00/execution,data/piglit/shader/glsl-es-1.00/execution) \
+	$(call find-copy-subdir-files,*.shader_test,external/piglit/tests/spec/glsl-es-3.00/execution,data/piglit/shader/glsl-es-3.00/execution) \
+	$(call find-copy-subdir-files,*.shader_test,external/piglit/tests/spec/glsl-es-3.00/linker,data/piglit/shader/glsl-es-3.00/linker) \
diff --git a/tests/glslparsertest/Android.mk b/tests/glslparsertest/Android.mk
index 28d4256a5..e1e58623e 100644
--- a/tests/glslparsertest/Android.mk
+++ b/tests/glslparsertest/Android.mk
@@ -10,9 +10,8 @@ include $(CLEAR_VARS)
 LOCAL_SHARED_LIBRARIES := libGLESv2 libwaffle-1 libpiglitutil
 LOCAL_C_INCLUDES := $(piglit_c_includes)
 LOCAL_CFLAGS := -DPIGLIT_USE_WAFFLE -DPIGLIT_USE_OPENGL_ES2 -DPIGLIT_HAS_ANDROID -DPIGLIT_HAS_EGL
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := glslparsertest
-systemtarball: glslparsertest
 LOCAL_SRC_FILES := glslparsertest.c
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)/piglit/glslparsertest
 include $(BUILD_EXECUTABLE)
diff --git a/tests/shaders/Android.mk b/tests/shaders/Android.mk
index ffb4078a3..43fc52eae 100644
--- a/tests/shaders/Android.mk
+++ b/tests/shaders/Android.mk
@@ -21,9 +21,8 @@ define $(module_name)_etc_add_executable
     LOCAL_SHARED_LIBRARIES := $(piglit_shared_libs)
     LOCAL_C_INCLUDES := $(piglit_c_includes)
     LOCAL_CFLAGS := $(piglit_c_flags)
-    LOCAL_MODULE_TAGS := eng
+    LOCAL_MODULE_TAGS := optional
     LOCAL_MODULE := $1
-    systemtarball: $1
     LOCAL_SRC_FILES := $1.c parser_utils.c 
     LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)/piglit/$(module_name)
     include $(BUILD_EXECUTABLE)
diff --git a/tests/spec/gles-2.0/Android.mk b/tests/spec/gles-2.0/Android.mk
index da1bbd5f8..dcaa1ab70 100644
--- a/tests/spec/gles-2.0/Android.mk
+++ b/tests/spec/gles-2.0/Android.mk
@@ -17,9 +17,8 @@ define $(module_name)_etc_add_executable
     LOCAL_SHARED_LIBRARIES := $(piglit_shared_libs)
     LOCAL_C_INCLUDES := $(piglit_c_includes)
     LOCAL_CFLAGS := $(piglit_c_flags)
-    LOCAL_MODULE_TAGS := eng
+    LOCAL_MODULE_TAGS := optional
     LOCAL_MODULE := $1_gles2
-    systemtarball: $1_gles2
     LOCAL_SRC_FILES := $1.c
     LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)/piglit/$(module_name)
     include $(BUILD_EXECUTABLE)
diff --git a/tests/spec/gles-3.0/Android.mk b/tests/spec/gles-3.0/Android.mk
index e52f72e09..1d34411ae 100644
--- a/tests/spec/gles-3.0/Android.mk
+++ b/tests/spec/gles-3.0/Android.mk
@@ -17,9 +17,8 @@ define $(module_name)_etc_add_executable
     LOCAL_SHARED_LIBRARIES := $(piglit_shared_libs)
     LOCAL_C_INCLUDES := $(piglit_c_includes)
     LOCAL_CFLAGS := $(piglit_c_flags)
-    LOCAL_MODULE_TAGS := eng
+    LOCAL_MODULE_TAGS := optional
     LOCAL_MODULE := $1_gles3
-    systemtarball: $1_gles3
     LOCAL_SRC_FILES := $1.c
     LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)/piglit/$(module_name)
     include $(BUILD_EXECUTABLE)
@@ -28,26 +27,3 @@ endef
 test_names :=  drawarrays-vertexid minmax oes_compressed_etc2_texture-miptree texture-immutable-levels
 
 $(foreach item,$(test_names),$(eval $(call $(module_name)_etc_add_executable, $(item))))
-
-define all-ktx-test-files-under
-$(patsubst ./%,%, \
-  $(shell cd $(1) ; \
-    find $(2) -name "*.ktx" -and -not -name ".*" -printf "%P\n" ) \
-   )
-endef
-
-define add_test_data
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $1
-$(warning $(LOCAL_SRC_FILES))
-LOCAL_MODULE:= $1
-LOCAL_MODULE_STEM := $1
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_CLASS := data
-LOCAL_MODULE_PATH:=$(TARGET_OUT_DATA)/piglit/tests/spec/gles-3.0/
-userdatatarball: $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-endef
-
-files := $(call all-ktx-test-files-under, $(LOCAL_PATH))
-$(foreach item,$(files),$(eval $(call 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
deleted file mode 100644
index f6e8d7e71..000000000
--- a/tests/spec/glsl-es-1.00/compiler/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-define all-vert-frag-files-under
-$(patsubst ./%,%, \
-  $(shell cd $(1) ; \
-    find ./  -regex ".*\.\(vert\|frag\)" -printf "%P\n" ) \
-   )
-endef
-
-$(eval surfix := $(notdir $(patsubst %/,%,$(dir $(LOCAL_PATH)))))
-define add_test_data
-  include $(CLEAR_VARS)
-  LOCAL_SRC_FILES := $(1)
-  $(eval base_name := $(notdir $(1)))
-  $(eval dir_name := $(dir $(1)))
-  LOCAL_MODULE := $(base_name)_$(surfix)
-  LOCAL_MODULE_STEM:= $(base_name)
-  LOCAL_MODULE_TAGS := eng
-  LOCAL_MODULE_CLASS := data
-  LOCAL_MODULE_PATH :=$(TARGET_OUT_DATA)/piglit/glslparser/$(surfix)/compiler/$(dir_name)
-  datatarball: $(LOCAL_MODULE)
-  include $(BUILD_PREBUILT)
-endef
-
-files := $(call all-vert-frag-files-under, $(LOCAL_PATH))
-$(foreach file, $(files), $(eval $(call add_test_data, $(file))))
diff --git a/tests/spec/glsl-es-1.00/execution/Android.mk b/tests/spec/glsl-es-1.00/execution/Android.mk
deleted file mode 100644
index dcaf2534e..000000000
--- a/tests/spec/glsl-es-1.00/execution/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-define all-shader-test-files-under
-$(patsubst ./%,%, \
-  $(shell cd $(1) ; \
-    find $(2) -name "*.shader_test" -and -not -name ".*" -printf "%P\n" ) \
-   )
-endef
-
-define add_test_data
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $1
-$(warning $(LOCAL_SRC_FILES))
-LOCAL_MODULE:= $1_glsl-es-1.00
-LOCAL_MODULE_STEM := $1
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_CLASS := data
-LOCAL_MODULE_PATH:=$(TARGET_OUT_DATA)/piglit/shader/glsl-es-1.00/execution
-userdatatarball: $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-endef
-
-files := $(call all-shader-test-files-under, $(LOCAL_PATH))
-$(foreach item,$(files),$(eval $(call add_test_data, $(item))))
diff --git a/tests/spec/glsl-es-3.00/compiler/Android.mk b/tests/spec/glsl-es-3.00/compiler/Android.mk
deleted file mode 100644
index f6e8d7e71..000000000
--- a/tests/spec/glsl-es-3.00/compiler/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-define all-vert-frag-files-under
-$(patsubst ./%,%, \
-  $(shell cd $(1) ; \
-    find ./  -regex ".*\.\(vert\|frag\)" -printf "%P\n" ) \
-   )
-endef
-
-$(eval surfix := $(notdir $(patsubst %/,%,$(dir $(LOCAL_PATH)))))
-define add_test_data
-  include $(CLEAR_VARS)
-  LOCAL_SRC_FILES := $(1)
-  $(eval base_name := $(notdir $(1)))
-  $(eval dir_name := $(dir $(1)))
-  LOCAL_MODULE := $(base_name)_$(surfix)
-  LOCAL_MODULE_STEM:= $(base_name)
-  LOCAL_MODULE_TAGS := eng
-  LOCAL_MODULE_CLASS := data
-  LOCAL_MODULE_PATH :=$(TARGET_OUT_DATA)/piglit/glslparser/$(surfix)/compiler/$(dir_name)
-  datatarball: $(LOCAL_MODULE)
-  include $(BUILD_PREBUILT)
-endef
-
-files := $(call all-vert-frag-files-under, $(LOCAL_PATH))
-$(foreach file, $(files), $(eval $(call add_test_data, $(file))))
diff --git a/tests/spec/glsl-es-3.00/execution/Android.mk b/tests/spec/glsl-es-3.00/execution/Android.mk
deleted file mode 100644
index a837c235d..000000000
--- a/tests/spec/glsl-es-3.00/execution/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-define all-shader-test-files-under
-$(patsubst ./%,%, \
-  $(shell cd $(1) ; \
-    find $(2) -name "*.shader_test" -and -not -name ".*" -printf "%P\n" ) \
-   )
-endef
-
-define add_test_data
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $1
-$(warning $(LOCAL_SRC_FILES))
-LOCAL_MODULE:= $1_glsl-es-3.00
-LOCAL_MODULE_STEM := $1
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_CLASS := data
-LOCAL_MODULE_PATH:=$(TARGET_OUT_DATA)/piglit/shader/glsl-es-3.00/execution
-userdatatarball: $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-endef
-
-files := $(call all-shader-test-files-under, $(LOCAL_PATH))
-$(foreach item,$(files),$(eval $(call add_test_data, $(item))))
diff --git a/tests/spec/glsl-es-3.00/linker/Android.mk b/tests/spec/glsl-es-3.00/linker/Android.mk
deleted file mode 100644
index 394943355..000000000
--- a/tests/spec/glsl-es-3.00/linker/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-define all-shader-test-files-under
-$(patsubst ./%,%, \
-  $(shell cd $(1) ; \
-    find $(2) -name "*.shader_test" -and -not -name ".*" -printf "%P\n" ) \
-   )
-endef
-
-define add_test_data
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $1
-$(warning $(LOCAL_SRC_FILES))
-LOCAL_MODULE:= $1_glsl-es-3.00
-LOCAL_MODULE_STEM := $1
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_CLASS := data
-LOCAL_MODULE_PATH:=$(TARGET_OUT_DATA)/piglit/shader/glsl-es-3.00/linker
-userdatatarball: $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-endef
-
-files := $(call all-shader-test-files-under, $(LOCAL_PATH))
-$(foreach item,$(files),$(eval $(call add_test_data, $(item))))
diff --git a/tests/util/Android.mk b/tests/util/Android.mk
index 34e1cf17c..364d994d3 100644
--- a/tests/util/Android.mk
+++ b/tests/util/Android.mk
@@ -9,7 +9,7 @@ piglit_minor_version := 0
 piglit_patch_version := 0
 
 LOCAL_MODULE := libpiglitutil
-LOCAL_MODULE_TAG := eng
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 
 intermediates:= $(local-intermediates-dir)