Adds a basic test wrapper for Android
To run libc++ tests:
$ mm
$ adb sync
$ python runtests.py # runs all host and device tests
# see main() for command line options
To regenerate all makefiles:
$ python makemake.py
Change-Id: Ibad78ad8e1bd45f32730d281afa53c2cec55478f
diff --git a/test/numerics/numarray/Android.mk b/test/numerics/numarray/Android.mk
new file mode 100644
index 0000000..aecd708
--- /dev/null
+++ b/test/numerics/numarray/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/Android.mk
+
+test_name := numerics/numarray/version
+test_src := version.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/class.gslice/Android.mk b/test/numerics/numarray/class.gslice/Android.mk
new file mode 100644
index 0000000..aa40fe5
--- /dev/null
+++ b/test/numerics/numarray/class.gslice/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/class.gslice/Android.mk
+
+test_name := numerics/numarray/class.gslice/nothing_to_do
+test_src := nothing_to_do.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/class.gslice/gslice.access/Android.mk b/test/numerics/numarray/class.gslice/gslice.access/Android.mk
new file mode 100644
index 0000000..8b03123
--- /dev/null
+++ b/test/numerics/numarray/class.gslice/gslice.access/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/class.gslice/gslice.access/Android.mk
+
+test_name := numerics/numarray/class.gslice/gslice.access/tested_elsewhere
+test_src := tested_elsewhere.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/class.gslice/gslice.cons/Android.mk b/test/numerics/numarray/class.gslice/gslice.cons/Android.mk
new file mode 100644
index 0000000..a8a6ba2
--- /dev/null
+++ b/test/numerics/numarray/class.gslice/gslice.cons/Android.mk
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/class.gslice/gslice.cons/Android.mk
+
+test_name := numerics/numarray/class.gslice/gslice.cons/default
+test_src := default.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/class.gslice/gslice.cons/start_size_stride
+test_src := start_size_stride.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/class.slice/Android.mk b/test/numerics/numarray/class.slice/Android.mk
new file mode 100644
index 0000000..8b44af1
--- /dev/null
+++ b/test/numerics/numarray/class.slice/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/class.slice/Android.mk
+
+test_name := numerics/numarray/class.slice/nothing_to_do
+test_src := nothing_to_do.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/class.slice/cons.slice/Android.mk b/test/numerics/numarray/class.slice/cons.slice/Android.mk
new file mode 100644
index 0000000..ea51bc6
--- /dev/null
+++ b/test/numerics/numarray/class.slice/cons.slice/Android.mk
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/class.slice/cons.slice/Android.mk
+
+test_name := numerics/numarray/class.slice/cons.slice/default
+test_src := default.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/class.slice/cons.slice/start_size_stride
+test_src := start_size_stride.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/class.slice/slice.access/Android.mk b/test/numerics/numarray/class.slice/slice.access/Android.mk
new file mode 100644
index 0000000..8238390
--- /dev/null
+++ b/test/numerics/numarray/class.slice/slice.access/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/class.slice/slice.access/Android.mk
+
+test_name := numerics/numarray/class.slice/slice.access/tested_elsewhere
+test_src := tested_elsewhere.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.gslice.array/Android.mk b/test/numerics/numarray/template.gslice.array/Android.mk
new file mode 100644
index 0000000..7ff7b28
--- /dev/null
+++ b/test/numerics/numarray/template.gslice.array/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.gslice.array/Android.mk
+
+test_name := numerics/numarray/template.gslice.array/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.gslice.array/gslice.array.assign/Android.mk b/test/numerics/numarray/template.gslice.array/gslice.array.assign/Android.mk
new file mode 100644
index 0000000..8231dc0
--- /dev/null
+++ b/test/numerics/numarray/template.gslice.array/gslice.array.assign/Android.mk
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.assign/Android.mk
+
+test_name := numerics/numarray/template.gslice.array/gslice.array.assign/gslice_array
+test_src := gslice_array.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.gslice.array/gslice.array.assign/valarray
+test_src := valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/Android.mk b/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/Android.mk
new file mode 100644
index 0000000..b663cde
--- /dev/null
+++ b/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/Android.mk
@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/Android.mk
+
+test_name := numerics/numarray/template.gslice.array/gslice.array.comp.assign/and
+test_src := and.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.gslice.array/gslice.array.comp.assign/multiply
+test_src := multiply.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.gslice.array/gslice.array.comp.assign/addition
+test_src := addition.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.gslice.array/gslice.array.comp.assign/subtraction
+test_src := subtraction.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.gslice.array/gslice.array.comp.assign/divide
+test_src := divide.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.gslice.array/gslice.array.comp.assign/modulo
+test_src := modulo.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.gslice.array/gslice.array.comp.assign/shift_right
+test_src := shift_right.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.gslice.array/gslice.array.comp.assign/xor
+test_src := xor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.gslice.array/gslice.array.comp.assign/shift_left
+test_src := shift_left.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.gslice.array/gslice.array.comp.assign/or
+test_src := or.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.gslice.array/gslice.array.fill/Android.mk b/test/numerics/numarray/template.gslice.array/gslice.array.fill/Android.mk
new file mode 100644
index 0000000..ecf84cf
--- /dev/null
+++ b/test/numerics/numarray/template.gslice.array/gslice.array.fill/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.fill/Android.mk
+
+test_name := numerics/numarray/template.gslice.array/gslice.array.fill/assign_value
+test_src := assign_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.indirect.array/Android.mk b/test/numerics/numarray/template.indirect.array/Android.mk
new file mode 100644
index 0000000..bfc563e
--- /dev/null
+++ b/test/numerics/numarray/template.indirect.array/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.indirect.array/Android.mk
+
+test_name := numerics/numarray/template.indirect.array/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.indirect.array/indirect.array.assign/Android.mk b/test/numerics/numarray/template.indirect.array/indirect.array.assign/Android.mk
new file mode 100644
index 0000000..1cc27ce
--- /dev/null
+++ b/test/numerics/numarray/template.indirect.array/indirect.array.assign/Android.mk
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.assign/Android.mk
+
+test_name := numerics/numarray/template.indirect.array/indirect.array.assign/indirect_array
+test_src := indirect_array.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.indirect.array/indirect.array.assign/valarray
+test_src := valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/Android.mk b/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/Android.mk
new file mode 100644
index 0000000..c8289d4
--- /dev/null
+++ b/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/Android.mk
@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/Android.mk
+
+test_name := numerics/numarray/template.indirect.array/indirect.array.comp.assign/and
+test_src := and.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.indirect.array/indirect.array.comp.assign/multiply
+test_src := multiply.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.indirect.array/indirect.array.comp.assign/addition
+test_src := addition.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.indirect.array/indirect.array.comp.assign/subtraction
+test_src := subtraction.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.indirect.array/indirect.array.comp.assign/divide
+test_src := divide.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.indirect.array/indirect.array.comp.assign/modulo
+test_src := modulo.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.indirect.array/indirect.array.comp.assign/shift_right
+test_src := shift_right.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.indirect.array/indirect.array.comp.assign/xor
+test_src := xor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.indirect.array/indirect.array.comp.assign/shift_left
+test_src := shift_left.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.indirect.array/indirect.array.comp.assign/or
+test_src := or.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.indirect.array/indirect.array.fill/Android.mk b/test/numerics/numarray/template.indirect.array/indirect.array.fill/Android.mk
new file mode 100644
index 0000000..77aa4f6
--- /dev/null
+++ b/test/numerics/numarray/template.indirect.array/indirect.array.fill/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.fill/Android.mk
+
+test_name := numerics/numarray/template.indirect.array/indirect.array.fill/assign_value
+test_src := assign_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.mask.array/Android.mk b/test/numerics/numarray/template.mask.array/Android.mk
new file mode 100644
index 0000000..34b164c
--- /dev/null
+++ b/test/numerics/numarray/template.mask.array/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.mask.array/Android.mk
+
+test_name := numerics/numarray/template.mask.array/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.mask.array/mask.array.assign/Android.mk b/test/numerics/numarray/template.mask.array/mask.array.assign/Android.mk
new file mode 100644
index 0000000..1d320f8
--- /dev/null
+++ b/test/numerics/numarray/template.mask.array/mask.array.assign/Android.mk
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.mask.array/mask.array.assign/Android.mk
+
+test_name := numerics/numarray/template.mask.array/mask.array.assign/mask_array
+test_src := mask_array.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.mask.array/mask.array.assign/valarray
+test_src := valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.mask.array/mask.array.comp.assign/Android.mk b/test/numerics/numarray/template.mask.array/mask.array.comp.assign/Android.mk
new file mode 100644
index 0000000..c3826d8
--- /dev/null
+++ b/test/numerics/numarray/template.mask.array/mask.array.comp.assign/Android.mk
@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/Android.mk
+
+test_name := numerics/numarray/template.mask.array/mask.array.comp.assign/and
+test_src := and.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.mask.array/mask.array.comp.assign/multiply
+test_src := multiply.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.mask.array/mask.array.comp.assign/addition
+test_src := addition.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.mask.array/mask.array.comp.assign/subtraction
+test_src := subtraction.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.mask.array/mask.array.comp.assign/divide
+test_src := divide.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.mask.array/mask.array.comp.assign/modulo
+test_src := modulo.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.mask.array/mask.array.comp.assign/shift_right
+test_src := shift_right.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.mask.array/mask.array.comp.assign/xor
+test_src := xor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.mask.array/mask.array.comp.assign/shift_left
+test_src := shift_left.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.mask.array/mask.array.comp.assign/or
+test_src := or.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.mask.array/mask.array.fill/Android.mk b/test/numerics/numarray/template.mask.array/mask.array.fill/Android.mk
new file mode 100644
index 0000000..507ed0d
--- /dev/null
+++ b/test/numerics/numarray/template.mask.array/mask.array.fill/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.mask.array/mask.array.fill/Android.mk
+
+test_name := numerics/numarray/template.mask.array/mask.array.fill/assign_value
+test_src := assign_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.slice.array/Android.mk b/test/numerics/numarray/template.slice.array/Android.mk
new file mode 100644
index 0000000..fc63424
--- /dev/null
+++ b/test/numerics/numarray/template.slice.array/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.slice.array/Android.mk
+
+test_name := numerics/numarray/template.slice.array/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.slice.array/slice.arr.assign/Android.mk b/test/numerics/numarray/template.slice.array/slice.arr.assign/Android.mk
new file mode 100644
index 0000000..c71453d
--- /dev/null
+++ b/test/numerics/numarray/template.slice.array/slice.arr.assign/Android.mk
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.slice.array/slice.arr.assign/Android.mk
+
+test_name := numerics/numarray/template.slice.array/slice.arr.assign/slice_array
+test_src := slice_array.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.slice.array/slice.arr.assign/valarray
+test_src := valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/Android.mk b/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/Android.mk
new file mode 100644
index 0000000..fbcaf6e
--- /dev/null
+++ b/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/Android.mk
@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/Android.mk
+
+test_name := numerics/numarray/template.slice.array/slice.arr.comp.assign/and
+test_src := and.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.slice.array/slice.arr.comp.assign/multiply
+test_src := multiply.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.slice.array/slice.arr.comp.assign/addition
+test_src := addition.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.slice.array/slice.arr.comp.assign/subtraction
+test_src := subtraction.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.slice.array/slice.arr.comp.assign/divide
+test_src := divide.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.slice.array/slice.arr.comp.assign/modulo
+test_src := modulo.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.slice.array/slice.arr.comp.assign/shift_right
+test_src := shift_right.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.slice.array/slice.arr.comp.assign/xor
+test_src := xor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.slice.array/slice.arr.comp.assign/shift_left
+test_src := shift_left.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.slice.array/slice.arr.comp.assign/or
+test_src := or.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.slice.array/slice.arr.fill/Android.mk b/test/numerics/numarray/template.slice.array/slice.arr.fill/Android.mk
new file mode 100644
index 0000000..85ad2a9
--- /dev/null
+++ b/test/numerics/numarray/template.slice.array/slice.arr.fill/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.slice.array/slice.arr.fill/Android.mk
+
+test_name := numerics/numarray/template.slice.array/slice.arr.fill/assign_value
+test_src := assign_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.valarray/Android.mk b/test/numerics/numarray/template.valarray/Android.mk
new file mode 100644
index 0000000..47fa67e
--- /dev/null
+++ b/test/numerics/numarray/template.valarray/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.valarray/Android.mk
+
+test_name := numerics/numarray/template.valarray/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.valarray/valarray.access/Android.mk b/test/numerics/numarray/template.valarray/valarray.access/Android.mk
new file mode 100644
index 0000000..f6942d4
--- /dev/null
+++ b/test/numerics/numarray/template.valarray/valarray.access/Android.mk
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.valarray/valarray.access/Android.mk
+
+test_name := numerics/numarray/template.valarray/valarray.access/access
+test_src := access.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.access/const_access
+test_src := const_access.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.valarray/valarray.assign/Android.mk b/test/numerics/numarray/template.valarray/valarray.assign/Android.mk
new file mode 100644
index 0000000..5dabbf0
--- /dev/null
+++ b/test/numerics/numarray/template.valarray/valarray.assign/Android.mk
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.valarray/valarray.assign/Android.mk
+
+test_name := numerics/numarray/template.valarray/valarray.assign/indirect_array_assign
+test_src := indirect_array_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.assign/mask_array_assign
+test_src := mask_array_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.assign/initializer_list_assign
+test_src := initializer_list_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.assign/move_assign
+test_src := move_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.assign/gslice_array_assign
+test_src := gslice_array_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.assign/copy_assign
+test_src := copy_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.assign/value_assign
+test_src := value_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.assign/slice_array_assign
+test_src := slice_array_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.valarray/valarray.cassign/Android.mk b/test/numerics/numarray/template.valarray/valarray.cassign/Android.mk
new file mode 100644
index 0000000..d9f8f11
--- /dev/null
+++ b/test/numerics/numarray/template.valarray/valarray.cassign/Android.mk
@@ -0,0 +1,99 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/Android.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/shift_right_valarray
+test_src := shift_right_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/times_valarray
+test_src := times_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/modulo_value
+test_src := modulo_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/minus_value
+test_src := minus_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/times_value
+test_src := times_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/xor_valarray
+test_src := xor_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/or_value
+test_src := or_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/xor_value
+test_src := xor_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/minus_valarray
+test_src := minus_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/and_value
+test_src := and_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/or_valarray
+test_src := or_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/shift_left_valarray
+test_src := shift_left_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/plus_valarray
+test_src := plus_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/modulo_valarray
+test_src := modulo_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/divide_valarray
+test_src := divide_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/and_valarray
+test_src := and_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/divide_value
+test_src := divide_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/plus_value
+test_src := plus_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/shift_right_value
+test_src := shift_right_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cassign/shift_left_value
+test_src := shift_left_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.valarray/valarray.cons/Android.mk b/test/numerics/numarray/template.valarray/valarray.cons/Android.mk
new file mode 100644
index 0000000..3da9bc2
--- /dev/null
+++ b/test/numerics/numarray/template.valarray/valarray.cons/Android.mk
@@ -0,0 +1,63 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.valarray/valarray.cons/Android.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cons/default
+test_src := default.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cons/indirect_array
+test_src := indirect_array.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cons/pointer_size
+test_src := pointer_size.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cons/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cons/move
+test_src := move.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cons/size
+test_src := size.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cons/initializer_list
+test_src := initializer_list.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cons/gslice_array
+test_src := gslice_array.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cons/mask_array
+test_src := mask_array.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cons/slice_array
+test_src := slice_array.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.cons/value_size
+test_src := value_size.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.valarray/valarray.members/Android.mk b/test/numerics/numarray/template.valarray/valarray.members/Android.mk
new file mode 100644
index 0000000..e96a0ec
--- /dev/null
+++ b/test/numerics/numarray/template.valarray/valarray.members/Android.mk
@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.valarray/valarray.members/Android.mk
+
+test_name := numerics/numarray/template.valarray/valarray.members/apply_value
+test_src := apply_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.members/shift
+test_src := shift.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.members/sum
+test_src := sum.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.members/swap
+test_src := swap.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.members/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.members/cshift
+test_src := cshift.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.members/size
+test_src := size.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.members/resize
+test_src := resize.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.members/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.members/apply_cref
+test_src := apply_cref.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.valarray/valarray.sub/Android.mk b/test/numerics/numarray/template.valarray/valarray.sub/Android.mk
new file mode 100644
index 0000000..f8bf548
--- /dev/null
+++ b/test/numerics/numarray/template.valarray/valarray.sub/Android.mk
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.valarray/valarray.sub/Android.mk
+
+test_name := numerics/numarray/template.valarray/valarray.sub/slice_const
+test_src := slice_const.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.sub/valarray_bool_non_const
+test_src := valarray_bool_non_const.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.sub/gslice_const
+test_src := gslice_const.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.sub/indirect_array_const
+test_src := indirect_array_const.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.sub/slice_non_const
+test_src := slice_non_const.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.sub/valarray_bool_const
+test_src := valarray_bool_const.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.sub/gslice_non_const
+test_src := gslice_non_const.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.sub/indirect_array_non_const
+test_src := indirect_array_non_const.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/template.valarray/valarray.unary/Android.mk b/test/numerics/numarray/template.valarray/valarray.unary/Android.mk
new file mode 100644
index 0000000..04fa790
--- /dev/null
+++ b/test/numerics/numarray/template.valarray/valarray.unary/Android.mk
@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/template.valarray/valarray.unary/Android.mk
+
+test_name := numerics/numarray/template.valarray/valarray.unary/not
+test_src := not.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.unary/bit_not
+test_src := bit_not.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.unary/negate
+test_src := negate.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/template.valarray/valarray.unary/plus
+test_src := plus.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/valarray.nonmembers/Android.mk b/test/numerics/numarray/valarray.nonmembers/Android.mk
new file mode 100644
index 0000000..cc5749f
--- /dev/null
+++ b/test/numerics/numarray/valarray.nonmembers/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/valarray.nonmembers/Android.mk
+
+test_name := numerics/numarray/valarray.nonmembers/nothing_to_do
+test_src := nothing_to_do.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/valarray.nonmembers/valarray.binary/Android.mk b/test/numerics/numarray/valarray.nonmembers/valarray.binary/Android.mk
new file mode 100644
index 0000000..1de8f39
--- /dev/null
+++ b/test/numerics/numarray/valarray.nonmembers/valarray.binary/Android.mk
@@ -0,0 +1,139 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/Android.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/divide_value_valarray
+test_src := divide_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/and_valarray_value
+test_src := and_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/xor_valarray_valarray
+test_src := xor_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/divide_valarray_value
+test_src := divide_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/modulo_valarray_value
+test_src := modulo_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_value_valarray
+test_src := shift_right_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/or_value_valarray
+test_src := or_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/minus_valarray_value
+test_src := minus_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_value_valarray
+test_src := shift_left_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/xor_valarray_value
+test_src := xor_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/minus_value_valarray
+test_src := minus_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/times_valarray_value
+test_src := times_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/minus_valarray_valarray
+test_src := minus_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/plus_value_valarray
+test_src := plus_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/modulo_valarray_valarray
+test_src := modulo_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/plus_valarray_valarray
+test_src := plus_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/divide_valarray_valarray
+test_src := divide_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_valarray_valarray
+test_src := shift_right_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_valarray_valarray
+test_src := shift_left_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_valarray_value
+test_src := shift_left_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/times_valarray_valarray
+test_src := times_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/and_valarray_valarray
+test_src := and_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/modulo_value_valarray
+test_src := modulo_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_valarray_value
+test_src := shift_right_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/or_valarray_valarray
+test_src := or_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/times_value_valarray
+test_src := times_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/and_value_valarray
+test_src := and_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/xor_value_valarray
+test_src := xor_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/or_valarray_value
+test_src := or_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.binary/plus_valarray_value
+test_src := plus_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/valarray.nonmembers/valarray.comparison/Android.mk b/test/numerics/numarray/valarray.nonmembers/valarray.comparison/Android.mk
new file mode 100644
index 0000000..2bb1ebc
--- /dev/null
+++ b/test/numerics/numarray/valarray.nonmembers/valarray.comparison/Android.mk
@@ -0,0 +1,115 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/Android.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_valarray_valarray
+test_src := greater_equal_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/and_valarray_value
+test_src := and_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/equal_value_valarray
+test_src := equal_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_value_valarray
+test_src := not_equal_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/less_valarray_valarray
+test_src := less_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/or_value_valarray
+test_src := or_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_valarray_valarray
+test_src := less_equal_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_valarray_valarray
+test_src := not_equal_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/equal_valarray_value
+test_src := equal_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/less_value_valarray
+test_src := less_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_value_valarray
+test_src := less_equal_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_valarray_value
+test_src := greater_equal_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/greater_valarray_valarray
+test_src := greater_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/and_valarray_valarray
+test_src := and_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_valarray_value
+test_src := not_equal_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/or_valarray_valarray
+test_src := or_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_value_valarray
+test_src := greater_equal_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_valarray_value
+test_src := less_equal_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/and_value_valarray
+test_src := and_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/less_valarray_value
+test_src := less_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/greater_valarray_value
+test_src := greater_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/greater_value_valarray
+test_src := greater_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/or_valarray_value
+test_src := or_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.comparison/equal_valarray_valarray
+test_src := equal_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/valarray.nonmembers/valarray.special/Android.mk b/test/numerics/numarray/valarray.nonmembers/valarray.special/Android.mk
new file mode 100644
index 0000000..29d45cd
--- /dev/null
+++ b/test/numerics/numarray/valarray.nonmembers/valarray.special/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.special/Android.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.special/swap
+test_src := swap.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/valarray.nonmembers/valarray.transcend/Android.mk b/test/numerics/numarray/valarray.nonmembers/valarray.transcend/Android.mk
new file mode 100644
index 0000000..63c0073
--- /dev/null
+++ b/test/numerics/numarray/valarray.nonmembers/valarray.transcend/Android.mk
@@ -0,0 +1,99 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/Android.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/sinh_valarray
+test_src := sinh_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/log10_valarray
+test_src := log10_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/abs_valarray
+test_src := abs_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/pow_valarray_valarray
+test_src := pow_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/cosh_valarray
+test_src := cosh_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/sqrt_valarray
+test_src := sqrt_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/pow_value_valarray
+test_src := pow_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/log_valarray
+test_src := log_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/cos_valarray
+test_src := cos_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/asin_valarray
+test_src := asin_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/pow_valarray_value
+test_src := pow_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/acos_valarray
+test_src := acos_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_valarray_valarray
+test_src := atan2_valarray_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/tan_valarray
+test_src := tan_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_valarray_value
+test_src := atan2_valarray_value.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_value_valarray
+test_src := atan2_value_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/sin_valarray
+test_src := sin_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/atan_valarray
+test_src := atan_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/exp_valarray
+test_src := exp_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.nonmembers/valarray.transcend/tanh_valarray
+test_src := tanh_valarray.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/valarray.range/Android.mk b/test/numerics/numarray/valarray.range/Android.mk
new file mode 100644
index 0000000..3602167
--- /dev/null
+++ b/test/numerics/numarray/valarray.range/Android.mk
@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/valarray.range/Android.mk
+
+test_name := numerics/numarray/valarray.range/begin_const
+test_src := begin_const.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.range/end_non_const
+test_src := end_non_const.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.range/end_const
+test_src := end_const.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numarray/valarray.range/begin_non_const
+test_src := begin_non_const.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/numerics/numarray/valarray.syn/Android.mk b/test/numerics/numarray/valarray.syn/Android.mk
new file mode 100644
index 0000000..1be7346
--- /dev/null
+++ b/test/numerics/numarray/valarray.syn/Android.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/numerics/numarray/valarray.syn/Android.mk
+
+test_name := numerics/numarray/valarray.syn/nothing_to_do
+test_src := nothing_to_do.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file