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

commit: 6f56ab789cb470620554d624c37f488285b3b04e [log] [tgz]
author: Dan Albert <danalbert@google.com> Tue May 06 14:12:12 2014 -0700
committer: Dan Albert <danalbert@google.com> Mon May 12 16:02:43 2014 -0700
tree: 94b24dad537044b02e3e4539356aecc22bd15499
parent: 7d57f1bbe2a5e91a6ec904da37f36791856cb93c [diff]
diff --git a/test/numerics/Android.mk b/test/numerics/Android.mk
new file mode 100644
index 0000000..22d3580
--- /dev/null
+++ b/test/numerics/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/Android.mk
+
+test_name := numerics/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/c.math/Android.mk b/test/numerics/c.math/Android.mk
new file mode 100644
index 0000000..d28ffc3
--- /dev/null
+++ b/test/numerics/c.math/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/c.math/Android.mk
+
+test_name := numerics/c.math/tgmath_h
+test_src := tgmath_h.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/c.math/ctgmath
+test_src := ctgmath.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/c.math/version_cmath
+test_src := version_cmath.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/c.math/cmath
+test_src := cmath.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/cfenv/Android.mk b/test/numerics/cfenv/Android.mk
new file mode 100644
index 0000000..8365c11
--- /dev/null
+++ b/test/numerics/cfenv/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/cfenv/Android.mk
+
+test_name := numerics/cfenv/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/cfenv/cfenv.syn/Android.mk b/test/numerics/cfenv/cfenv.syn/Android.mk
new file mode 100644
index 0000000..3c90394
--- /dev/null
+++ b/test/numerics/cfenv/cfenv.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/cfenv/cfenv.syn/Android.mk
+
+test_name := numerics/cfenv/cfenv.syn/cfenv
+test_src := cfenv.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/complex.number/Android.mk b/test/numerics/complex.number/Android.mk
new file mode 100644
index 0000000..b6782ff
--- /dev/null
+++ b/test/numerics/complex.number/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/complex.number/Android.mk
+
+test_name := numerics/complex.number/layout
+test_src := layout.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/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/complex.number/ccmplx/Android.mk b/test/numerics/complex.number/ccmplx/Android.mk
new file mode 100644
index 0000000..5523678
--- /dev/null
+++ b/test/numerics/complex.number/ccmplx/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/complex.number/ccmplx/Android.mk
+
+test_name := numerics/complex.number/ccmplx/ccomplex
+test_src := ccomplex.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/complex.number/cmplx.over/Android.mk b/test/numerics/complex.number/cmplx.over/Android.mk
new file mode 100644
index 0000000..cbd8fe1
--- /dev/null
+++ b/test/numerics/complex.number/cmplx.over/Android.mk

@@ -0,0 +1,47 @@
+#
+# 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/complex.number/cmplx.over/Android.mk
+
+test_name := numerics/complex.number/cmplx.over/conj
+test_src := conj.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/cmplx.over/imag
+test_src := imag.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/cmplx.over/proj
+test_src := proj.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/cmplx.over/real
+test_src := real.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/cmplx.over/arg
+test_src := arg.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/cmplx.over/pow
+test_src := pow.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/cmplx.over/norm
+test_src := norm.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/complex.number/complex.literals/Android.mk b/test/numerics/complex.number/complex.literals/Android.mk
new file mode 100644
index 0000000..fa46214
--- /dev/null
+++ b/test/numerics/complex.number/complex.literals/Android.mk

@@ -0,0 +1,31 @@
+#
+# 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/complex.number/complex.literals/Android.mk
+
+test_name := numerics/complex.number/complex.literals/literals2
+test_src := literals2.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.literals/literals1
+test_src := literals1.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.literals/literals
+test_src := literals.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/complex.number/complex.member.ops/Android.mk b/test/numerics/complex.number/complex.member.ops/Android.mk
new file mode 100644
index 0000000..356eefb
--- /dev/null
+++ b/test/numerics/complex.number/complex.member.ops/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/complex.number/complex.member.ops/Android.mk
+
+test_name := numerics/complex.number/complex.member.ops/divide_equal_complex
+test_src := divide_equal_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.member.ops/minus_equal_scalar
+test_src := minus_equal_scalar.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.member.ops/minus_equal_complex
+test_src := minus_equal_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.member.ops/plus_equal_scalar
+test_src := plus_equal_scalar.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.member.ops/times_equal_complex
+test_src := times_equal_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.member.ops/times_equal_scalar
+test_src := times_equal_scalar.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.member.ops/assignment_complex
+test_src := assignment_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.member.ops/assignment_scalar
+test_src := assignment_scalar.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.member.ops/divide_equal_scalar
+test_src := divide_equal_scalar.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.member.ops/plus_equal_complex
+test_src := plus_equal_complex.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/complex.number/complex.members/Android.mk b/test/numerics/complex.number/complex.members/Android.mk
new file mode 100644
index 0000000..0cedf0e
--- /dev/null
+++ b/test/numerics/complex.number/complex.members/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/complex.number/complex.members/Android.mk
+
+test_name := numerics/complex.number/complex.members/construct
+test_src := construct.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.members/real_imag
+test_src := real_imag.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/complex.number/complex.ops/Android.mk b/test/numerics/complex.number/complex.ops/Android.mk
new file mode 100644
index 0000000..9736b57
--- /dev/null
+++ b/test/numerics/complex.number/complex.ops/Android.mk

@@ -0,0 +1,107 @@
+#
+# 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/complex.number/complex.ops/Android.mk
+
+test_name := numerics/complex.number/complex.ops/scalar_divide_complex
+test_src := scalar_divide_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/complex_plus_complex
+test_src := complex_plus_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/complex_times_scalar
+test_src := complex_times_scalar.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/complex_not_equals_scalar
+test_src := complex_not_equals_scalar.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/complex_equals_scalar
+test_src := complex_equals_scalar.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/unary_plus
+test_src := unary_plus.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/stream_input
+test_src := stream_input.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/complex_divide_scalar
+test_src := complex_divide_scalar.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/scalar_plus_complex
+test_src := scalar_plus_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/scalar_times_complex
+test_src := scalar_times_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/complex_divide_complex
+test_src := complex_divide_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/complex_not_equals_complex
+test_src := complex_not_equals_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/complex_minus_scalar
+test_src := complex_minus_scalar.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/stream_output
+test_src := stream_output.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/complex_minus_complex
+test_src := complex_minus_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/complex_equals_complex
+test_src := complex_equals_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/unary_minus
+test_src := unary_minus.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/complex_times_complex
+test_src := complex_times_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/scalar_not_equals_complex
+test_src := scalar_not_equals_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/complex_plus_scalar
+test_src := complex_plus_scalar.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/scalar_minus_complex
+test_src := scalar_minus_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.ops/scalar_equals_complex
+test_src := scalar_equals_complex.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/complex.number/complex.special/Android.mk b/test/numerics/complex.number/complex.special/Android.mk
new file mode 100644
index 0000000..60ae725
--- /dev/null
+++ b/test/numerics/complex.number/complex.special/Android.mk

@@ -0,0 +1,55 @@
+#
+# 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/complex.number/complex.special/Android.mk
+
+test_name := numerics/complex.number/complex.special/long_double_float_implicit
+test_src := long_double_float_implicit.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.special/long_double_double_implicit
+test_src := long_double_double_implicit.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.special/float_double_explicit
+test_src := float_double_explicit.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.special/long_double_double_explicit
+test_src := long_double_double_explicit.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.special/double_long_double_explicit
+test_src := double_long_double_explicit.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.special/double_float_implicit
+test_src := double_float_implicit.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.special/float_long_double_explicit
+test_src := float_long_double_explicit.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.special/double_float_explicit
+test_src := double_float_explicit.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.special/long_double_float_explicit
+test_src := long_double_float_explicit.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/complex.number/complex.synopsis/Android.mk b/test/numerics/complex.number/complex.synopsis/Android.mk
new file mode 100644
index 0000000..ef3bef5
--- /dev/null
+++ b/test/numerics/complex.number/complex.synopsis/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/complex.number/complex.synopsis/Android.mk
+
+test_name := numerics/complex.number/complex.synopsis/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/complex.number/complex.transcendentals/Android.mk b/test/numerics/complex.number/complex.transcendentals/Android.mk
new file mode 100644
index 0000000..a14045b
--- /dev/null
+++ b/test/numerics/complex.number/complex.transcendentals/Android.mk

@@ -0,0 +1,95 @@
+#
+# 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/complex.number/complex.transcendentals/Android.mk
+
+test_name := numerics/complex.number/complex.transcendentals/cosh
+test_src := cosh.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/exp
+test_src := exp.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/log
+test_src := log.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/atanh
+test_src := atanh.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/pow_complex_scalar
+test_src := pow_complex_scalar.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/log10
+test_src := log10.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/asin
+test_src := asin.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/acos
+test_src := acos.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/tan
+test_src := tan.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/pow_complex_complex
+test_src := pow_complex_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/cos
+test_src := cos.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/sinh
+test_src := sinh.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/sin
+test_src := sin.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/pow_scalar_complex
+test_src := pow_scalar_complex.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/sqrt
+test_src := sqrt.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/acosh
+test_src := acosh.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/asinh
+test_src := asinh.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/atan
+test_src := atan.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.transcendentals/tanh
+test_src := tanh.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/complex.number/complex.value.ops/Android.mk b/test/numerics/complex.number/complex.value.ops/Android.mk
new file mode 100644
index 0000000..8693a49
--- /dev/null
+++ b/test/numerics/complex.number/complex.value.ops/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/complex.number/complex.value.ops/Android.mk
+
+test_name := numerics/complex.number/complex.value.ops/polar
+test_src := polar.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.value.ops/conj
+test_src := conj.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.value.ops/abs
+test_src := abs.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.value.ops/imag
+test_src := imag.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.value.ops/proj
+test_src := proj.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.value.ops/real
+test_src := real.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.value.ops/arg
+test_src := arg.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/complex.number/complex.value.ops/norm
+test_src := norm.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/complex.number/complex/Android.mk b/test/numerics/complex.number/complex/Android.mk
new file mode 100644
index 0000000..56866c8
--- /dev/null
+++ b/test/numerics/complex.number/complex/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/complex.number/complex/Android.mk
+
+test_name := numerics/complex.number/complex/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/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

diff --git a/test/numerics/numeric.ops/Android.mk b/test/numerics/numeric.ops/Android.mk
new file mode 100644
index 0000000..a120dfb
--- /dev/null
+++ b/test/numerics/numeric.ops/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/numeric.ops/Android.mk
+
+test_name := numerics/numeric.ops/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/numeric.ops/accumulate/Android.mk b/test/numerics/numeric.ops/accumulate/Android.mk
new file mode 100644
index 0000000..72243b7
--- /dev/null
+++ b/test/numerics/numeric.ops/accumulate/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/numeric.ops/accumulate/Android.mk
+
+test_name := numerics/numeric.ops/accumulate/accumulate
+test_src := accumulate.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numeric.ops/accumulate/accumulate_op
+test_src := accumulate_op.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/numeric.ops/adjacent.difference/Android.mk b/test/numerics/numeric.ops/adjacent.difference/Android.mk
new file mode 100644
index 0000000..e01a5cc
--- /dev/null
+++ b/test/numerics/numeric.ops/adjacent.difference/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/numeric.ops/adjacent.difference/Android.mk
+
+test_name := numerics/numeric.ops/adjacent.difference/adjacent_difference_op
+test_src := adjacent_difference_op.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numeric.ops/adjacent.difference/adjacent_difference
+test_src := adjacent_difference.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/numeric.ops/inner.product/Android.mk b/test/numerics/numeric.ops/inner.product/Android.mk
new file mode 100644
index 0000000..e586d8e
--- /dev/null
+++ b/test/numerics/numeric.ops/inner.product/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/numeric.ops/inner.product/Android.mk
+
+test_name := numerics/numeric.ops/inner.product/inner_product
+test_src := inner_product.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numeric.ops/inner.product/inner_product_comp
+test_src := inner_product_comp.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/numeric.ops/numeric.iota/Android.mk b/test/numerics/numeric.ops/numeric.iota/Android.mk
new file mode 100644
index 0000000..f16eb51
--- /dev/null
+++ b/test/numerics/numeric.ops/numeric.iota/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/numeric.ops/numeric.iota/Android.mk
+
+test_name := numerics/numeric.ops/numeric.iota/iota
+test_src := iota.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/numeric.ops/partial.sum/Android.mk b/test/numerics/numeric.ops/partial.sum/Android.mk
new file mode 100644
index 0000000..d832758
--- /dev/null
+++ b/test/numerics/numeric.ops/partial.sum/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/numeric.ops/partial.sum/Android.mk
+
+test_name := numerics/numeric.ops/partial.sum/partial_sum_op
+test_src := partial_sum_op.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/numeric.ops/partial.sum/partial_sum
+test_src := partial_sum.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/numeric.requirements/Android.mk b/test/numerics/numeric.requirements/Android.mk
new file mode 100644
index 0000000..d3d1c20
--- /dev/null
+++ b/test/numerics/numeric.requirements/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/numeric.requirements/Android.mk
+
+test_name := numerics/numeric.requirements/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/numerics.general/Android.mk b/test/numerics/numerics.general/Android.mk
new file mode 100644
index 0000000..40003dc
--- /dev/null
+++ b/test/numerics/numerics.general/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/numerics.general/Android.mk
+
+test_name := numerics/numerics.general/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/rand/Android.mk b/test/numerics/rand/Android.mk
new file mode 100644
index 0000000..666c954
--- /dev/null
+++ b/test/numerics/rand/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/rand/Android.mk
+
+test_name := numerics/rand/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/rand/rand.adapt/Android.mk b/test/numerics/rand/rand.adapt/Android.mk
new file mode 100644
index 0000000..59295d5
--- /dev/null
+++ b/test/numerics/rand/rand.adapt/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/rand/rand.adapt/Android.mk
+
+test_name := numerics/rand/rand.adapt/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/rand/rand.adapt/rand.adapt.disc/Android.mk b/test/numerics/rand/rand.adapt/rand.adapt.disc/Android.mk
new file mode 100644
index 0000000..2f0e567
--- /dev/null
+++ b/test/numerics/rand/rand.adapt/rand.adapt.disc/Android.mk

@@ -0,0 +1,75 @@
+#
+# 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/rand/rand.adapt/rand.adapt.disc/Android.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.disc/default
+test_src := default.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.disc/discard
+test_src := discard.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.disc/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.disc/result_type
+test_src := result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.disc/ctor_result_type
+test_src := ctor_result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.disc/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.disc/ctor_engine_move
+test_src := ctor_engine_move.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.disc/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.disc/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.disc/values
+test_src := values.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.disc/ctor_sseq
+test_src := ctor_sseq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.disc/seed_result_type
+test_src := seed_result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.disc/seed_sseq
+test_src := seed_sseq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.disc/ctor_engine_copy
+test_src := ctor_engine_copy.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/rand/rand.adapt/rand.adapt.ibits/Android.mk b/test/numerics/rand/rand.adapt/rand.adapt.ibits/Android.mk
new file mode 100644
index 0000000..c966935
--- /dev/null
+++ b/test/numerics/rand/rand.adapt/rand.adapt.ibits/Android.mk

@@ -0,0 +1,75 @@
+#
+# 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/rand/rand.adapt/rand.adapt.ibits/Android.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.ibits/default
+test_src := default.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.ibits/discard
+test_src := discard.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.ibits/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.ibits/result_type
+test_src := result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.ibits/ctor_result_type
+test_src := ctor_result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.ibits/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.ibits/ctor_engine_move
+test_src := ctor_engine_move.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.ibits/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.ibits/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.ibits/values
+test_src := values.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.ibits/ctor_sseq
+test_src := ctor_sseq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.ibits/seed_result_type
+test_src := seed_result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.ibits/seed_sseq
+test_src := seed_sseq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.ibits/ctor_engine_copy
+test_src := ctor_engine_copy.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/rand/rand.adapt/rand.adapt.shuf/Android.mk b/test/numerics/rand/rand.adapt/rand.adapt.shuf/Android.mk
new file mode 100644
index 0000000..0578bae
--- /dev/null
+++ b/test/numerics/rand/rand.adapt/rand.adapt.shuf/Android.mk

@@ -0,0 +1,75 @@
+#
+# 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/rand/rand.adapt/rand.adapt.shuf/Android.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.shuf/default
+test_src := default.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.shuf/discard
+test_src := discard.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.shuf/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.shuf/result_type
+test_src := result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.shuf/ctor_result_type
+test_src := ctor_result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.shuf/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.shuf/ctor_engine_move
+test_src := ctor_engine_move.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.shuf/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.shuf/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.shuf/values
+test_src := values.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.shuf/ctor_sseq
+test_src := ctor_sseq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.shuf/seed_result_type
+test_src := seed_result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.shuf/seed_sseq
+test_src := seed_sseq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.adapt/rand.adapt.shuf/ctor_engine_copy
+test_src := ctor_engine_copy.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/rand/rand.device/Android.mk b/test/numerics/rand/rand.device/Android.mk
new file mode 100644
index 0000000..524f184
--- /dev/null
+++ b/test/numerics/rand/rand.device/Android.mk

@@ -0,0 +1,31 @@
+#
+# 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/rand/rand.device/Android.mk
+
+test_name := numerics/rand/rand.device/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.device/entropy
+test_src := entropy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.device/ctor
+test_src := ctor.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/rand/rand.dis/Android.mk b/test/numerics/rand/rand.dis/Android.mk
new file mode 100644
index 0000000..e143244
--- /dev/null
+++ b/test/numerics/rand/rand.dis/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/rand/rand.dis/Android.mk
+
+test_name := numerics/rand/rand.dis/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/rand/rand.dis/rand.dist.bern/Android.mk b/test/numerics/rand/rand.dis/rand.dist.bern/Android.mk
new file mode 100644
index 0000000..d36081f
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.bern/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/rand/rand.dis/rand.dist.bern/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/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/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/Android.mk b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/Android.mk
new file mode 100644
index 0000000..7b522b0
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_eq
+test_src := param_eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/ctor_double
+test_src := ctor_double.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/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/Android.mk b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/Android.mk
new file mode 100644
index 0000000..fe9b340
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/ctor_int_double
+test_src := ctor_int_double.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_eq
+test_src := param_eq.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/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/Android.mk b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/Android.mk
new file mode 100644
index 0000000..2968f9e
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_eq
+test_src := param_eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/ctor_double
+test_src := ctor_double.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/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/Android.mk b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/Android.mk
new file mode 100644
index 0000000..36bbcd4
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/ctor_int_double
+test_src := ctor_int_double.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_eq
+test_src := param_eq.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/rand/rand.dis/rand.dist.norm/Android.mk b/test/numerics/rand/rand.dis/rand.dist.norm/Android.mk
new file mode 100644
index 0000000..6be6216
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.norm/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/rand/rand.dis/rand.dist.norm/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/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/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/Android.mk b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/Android.mk
new file mode 100644
index 0000000..95636eb
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/ctor_double_double
+test_src := ctor_double_double.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_eq
+test_src := param_eq.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/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/Android.mk b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/Android.mk
new file mode 100644
index 0000000..3e76cef
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_eq
+test_src := param_eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/ctor_double
+test_src := ctor_double.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/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/Android.mk b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/Android.mk
new file mode 100644
index 0000000..9e36bde
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/ctor_double_double
+test_src := ctor_double_double.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_eq
+test_src := param_eq.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/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/Android.mk b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/Android.mk
new file mode 100644
index 0000000..d451f29
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/ctor_double_double
+test_src := ctor_double_double.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_eq
+test_src := param_eq.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/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/Android.mk b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/Android.mk
new file mode 100644
index 0000000..8e845be
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/ctor_double_double
+test_src := ctor_double_double.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_eq
+test_src := param_eq.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/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/Android.mk b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/Android.mk
new file mode 100644
index 0000000..5679a57
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_eq
+test_src := param_eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/ctor_double
+test_src := ctor_double.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/rand/rand.dis/rand.dist.pois/Android.mk b/test/numerics/rand/rand.dis/rand.dist.pois/Android.mk
new file mode 100644
index 0000000..be43e91
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.pois/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/rand/rand.dis/rand.dist.pois/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/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/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/Android.mk b/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/Android.mk
new file mode 100644
index 0000000..3e4c1ef
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_eq
+test_src := param_eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/ctor_double
+test_src := ctor_double.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/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/Android.mk b/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/Android.mk
new file mode 100644
index 0000000..6e02a6c
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/ctor_double_double
+test_src := ctor_double_double.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_eq
+test_src := param_eq.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/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/Android.mk b/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/Android.mk
new file mode 100644
index 0000000..773b986
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/ctor_double_double
+test_src := ctor_double_double.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_eq
+test_src := param_eq.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/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/Android.mk b/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/Android.mk
new file mode 100644
index 0000000..6bc554a
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_eq
+test_src := param_eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/ctor_double
+test_src := ctor_double.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/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/Android.mk b/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/Android.mk
new file mode 100644
index 0000000..6395cc3
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/ctor_double_double
+test_src := ctor_double_double.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_eq
+test_src := param_eq.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/rand/rand.dis/rand.dist.samp/Android.mk b/test/numerics/rand/rand.dis/rand.dist.samp/Android.mk
new file mode 100644
index 0000000..24ada45
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.samp/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/rand/rand.dis/rand.dist.samp/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/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/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/Android.mk b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/Android.mk
new file mode 100644
index 0000000..1a7cfde
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/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/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_default
+test_src := param_ctor_default.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_iterator
+test_src := param_ctor_iterator.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_init
+test_src := param_ctor_init.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_func
+test_src := ctor_func.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_func
+test_src := param_ctor_func.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_iterator
+test_src := ctor_iterator.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_init
+test_src := ctor_init.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_eq
+test_src := param_eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_default
+test_src := ctor_default.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/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/Android.mk b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/Android.mk
new file mode 100644
index 0000000..736ffed
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/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/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_default
+test_src := param_ctor_default.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_iterator
+test_src := param_ctor_iterator.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_init_func
+test_src := param_ctor_init_func.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_init_func
+test_src := ctor_init_func.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_func
+test_src := ctor_func.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_func
+test_src := param_ctor_func.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_iterator
+test_src := ctor_iterator.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_eq
+test_src := param_eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_default
+test_src := ctor_default.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/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/Android.mk b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/Android.mk
new file mode 100644
index 0000000..3aacdd5
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/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/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_default
+test_src := param_ctor_default.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_iterator
+test_src := param_ctor_iterator.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_init_func
+test_src := param_ctor_init_func.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_init_func
+test_src := ctor_init_func.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_func
+test_src := ctor_func.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_func
+test_src := param_ctor_func.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_iterator
+test_src := ctor_iterator.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_eq
+test_src := param_eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_default
+test_src := ctor_default.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/rand/rand.dis/rand.dist.uni/Android.mk b/test/numerics/rand/rand.dis/rand.dist.uni/Android.mk
new file mode 100644
index 0000000..db38c7c
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.uni/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/rand/rand.dis/rand.dist.uni/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/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/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/Android.mk b/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/Android.mk
new file mode 100644
index 0000000..50b4d3b
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/ctor_int_int
+test_src := ctor_int_int.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_eq
+test_src := param_eq.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/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/Android.mk b/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/Android.mk
new file mode 100644
index 0000000..6be8475
--- /dev/null
+++ b/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/Android.mk

@@ -0,0 +1,91 @@
+#
+# 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/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/Android.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_copy
+test_src := param_copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/min
+test_src := min.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/ctor_int_int
+test_src := ctor_int_int.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/ctor_param
+test_src := ctor_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_types
+test_src := param_types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/get_param
+test_src := get_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/set_param
+test_src := set_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eval_param
+test_src := eval_param.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_ctor
+test_src := param_ctor.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/max
+test_src := max.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eq
+test_src := eq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_assign
+test_src := param_assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_eq
+test_src := param_eq.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/rand/rand.eng/Android.mk b/test/numerics/rand/rand.eng/Android.mk
new file mode 100644
index 0000000..e01e1c9
--- /dev/null
+++ b/test/numerics/rand/rand.eng/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/rand/rand.eng/Android.mk
+
+test_name := numerics/rand/rand.eng/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/rand/rand.eng/rand.eng.lcong/Android.mk b/test/numerics/rand/rand.eng/rand.eng.lcong/Android.mk
new file mode 100644
index 0000000..73e8267
--- /dev/null
+++ b/test/numerics/rand/rand.eng/rand.eng.lcong/Android.mk

@@ -0,0 +1,67 @@
+#
+# 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/rand/rand.eng/rand.eng.lcong/Android.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.lcong/default
+test_src := default.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.lcong/discard
+test_src := discard.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.lcong/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.lcong/result_type
+test_src := result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.lcong/ctor_result_type
+test_src := ctor_result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.lcong/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.lcong/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.lcong/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.lcong/values
+test_src := values.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.lcong/ctor_sseq
+test_src := ctor_sseq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.lcong/seed_result_type
+test_src := seed_result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.lcong/seed_sseq
+test_src := seed_sseq.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/rand/rand.eng/rand.eng.mers/Android.mk b/test/numerics/rand/rand.eng/rand.eng.mers/Android.mk
new file mode 100644
index 0000000..db4bf82
--- /dev/null
+++ b/test/numerics/rand/rand.eng/rand.eng.mers/Android.mk

@@ -0,0 +1,67 @@
+#
+# 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/rand/rand.eng/rand.eng.mers/Android.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.mers/default
+test_src := default.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.mers/discard
+test_src := discard.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.mers/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.mers/result_type
+test_src := result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.mers/ctor_result_type
+test_src := ctor_result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.mers/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.mers/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.mers/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.mers/values
+test_src := values.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.mers/ctor_sseq
+test_src := ctor_sseq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.mers/seed_result_type
+test_src := seed_result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.mers/seed_sseq
+test_src := seed_sseq.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/rand/rand.eng/rand.eng.sub/Android.mk b/test/numerics/rand/rand.eng/rand.eng.sub/Android.mk
new file mode 100644
index 0000000..d9163d9
--- /dev/null
+++ b/test/numerics/rand/rand.eng/rand.eng.sub/Android.mk

@@ -0,0 +1,67 @@
+#
+# 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/rand/rand.eng/rand.eng.sub/Android.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.sub/default
+test_src := default.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.sub/discard
+test_src := discard.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.sub/io
+test_src := io.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.sub/result_type
+test_src := result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.sub/ctor_result_type
+test_src := ctor_result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.sub/eval
+test_src := eval.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.sub/copy
+test_src := copy.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.sub/assign
+test_src := assign.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.sub/values
+test_src := values.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.sub/ctor_sseq
+test_src := ctor_sseq.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.sub/seed_result_type
+test_src := seed_result_type.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.eng/rand.eng.sub/seed_sseq
+test_src := seed_sseq.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/rand/rand.predef/Android.mk b/test/numerics/rand/rand.predef/Android.mk
new file mode 100644
index 0000000..b2a0f0a
--- /dev/null
+++ b/test/numerics/rand/rand.predef/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/rand/rand.predef/Android.mk
+
+test_name := numerics/rand/rand.predef/mt19937
+test_src := mt19937.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.predef/minstd_rand
+test_src := minstd_rand.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.predef/ranlux24_base
+test_src := ranlux24_base.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.predef/ranlux24
+test_src := ranlux24.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.predef/ranlux48_base
+test_src := ranlux48_base.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.predef/ranlux48
+test_src := ranlux48.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.predef/mt19937_64
+test_src := mt19937_64.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.predef/minstd_rand0
+test_src := minstd_rand0.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.predef/knuth_b
+test_src := knuth_b.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.predef/default_random_engine
+test_src := default_random_engine.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/rand/rand.req/Android.mk b/test/numerics/rand/rand.req/Android.mk
new file mode 100644
index 0000000..f3da578
--- /dev/null
+++ b/test/numerics/rand/rand.req/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/rand/rand.req/Android.mk
+
+test_name := numerics/rand/rand.req/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/rand/rand.req/rand.req.adapt/Android.mk b/test/numerics/rand/rand.req/rand.req.adapt/Android.mk
new file mode 100644
index 0000000..1c2dbd8
--- /dev/null
+++ b/test/numerics/rand/rand.req/rand.req.adapt/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/rand/rand.req/rand.req.adapt/Android.mk
+
+test_name := numerics/rand/rand.req/rand.req.adapt/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/rand/rand.req/rand.req.dst/Android.mk b/test/numerics/rand/rand.req/rand.req.dst/Android.mk
new file mode 100644
index 0000000..40084e2
--- /dev/null
+++ b/test/numerics/rand/rand.req/rand.req.dst/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/rand/rand.req/rand.req.dst/Android.mk
+
+test_name := numerics/rand/rand.req/rand.req.dst/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/rand/rand.req/rand.req.eng/Android.mk b/test/numerics/rand/rand.req/rand.req.eng/Android.mk
new file mode 100644
index 0000000..5523528
--- /dev/null
+++ b/test/numerics/rand/rand.req/rand.req.eng/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/rand/rand.req/rand.req.eng/Android.mk
+
+test_name := numerics/rand/rand.req/rand.req.eng/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/rand/rand.req/rand.req.genl/Android.mk b/test/numerics/rand/rand.req/rand.req.genl/Android.mk
new file mode 100644
index 0000000..cdb6a3c
--- /dev/null
+++ b/test/numerics/rand/rand.req/rand.req.genl/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/rand/rand.req/rand.req.genl/Android.mk
+
+test_name := numerics/rand/rand.req/rand.req.genl/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/rand/rand.req/rand.req.seedseq/Android.mk b/test/numerics/rand/rand.req/rand.req.seedseq/Android.mk
new file mode 100644
index 0000000..066c9fa
--- /dev/null
+++ b/test/numerics/rand/rand.req/rand.req.seedseq/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/rand/rand.req/rand.req.seedseq/Android.mk
+
+test_name := numerics/rand/rand.req/rand.req.seedseq/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/rand/rand.req/rand.req.urng/Android.mk b/test/numerics/rand/rand.req/rand.req.urng/Android.mk
new file mode 100644
index 0000000..03a9b0a
--- /dev/null
+++ b/test/numerics/rand/rand.req/rand.req.urng/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/rand/rand.req/rand.req.urng/Android.mk
+
+test_name := numerics/rand/rand.req/rand.req.urng/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/rand/rand.synopsis/Android.mk b/test/numerics/rand/rand.synopsis/Android.mk
new file mode 100644
index 0000000..34aeedc
--- /dev/null
+++ b/test/numerics/rand/rand.synopsis/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/rand/rand.synopsis/Android.mk
+
+test_name := numerics/rand/rand.synopsis/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/rand/rand.util/Android.mk b/test/numerics/rand/rand.util/Android.mk
new file mode 100644
index 0000000..5ad6989
--- /dev/null
+++ b/test/numerics/rand/rand.util/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/rand/rand.util/Android.mk
+
+test_name := numerics/rand/rand.util/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/rand/rand.util/rand.util.canonical/Android.mk b/test/numerics/rand/rand.util/rand.util.canonical/Android.mk
new file mode 100644
index 0000000..2bceac7
--- /dev/null
+++ b/test/numerics/rand/rand.util/rand.util.canonical/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/rand/rand.util/rand.util.canonical/Android.mk
+
+test_name := numerics/rand/rand.util/rand.util.canonical/generate_canonical
+test_src := generate_canonical.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/rand/rand.util/rand.util.seedseq/Android.mk b/test/numerics/rand/rand.util/rand.util.seedseq/Android.mk
new file mode 100644
index 0000000..3ee2bce
--- /dev/null
+++ b/test/numerics/rand/rand.util/rand.util.seedseq/Android.mk

@@ -0,0 +1,39 @@
+#
+# 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/rand/rand.util/rand.util.seedseq/Android.mk
+
+test_name := numerics/rand/rand.util/rand.util.seedseq/default
+test_src := default.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.util/rand.util.seedseq/iterator
+test_src := iterator.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.util/rand.util.seedseq/generate
+test_src := generate.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.util/rand.util.seedseq/types
+test_src := types.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+test_name := numerics/rand/rand.util/rand.util.seedseq/initializer_list
+test_src := initializer_list.pass.cpp
+include external/libcxx/test/Android.build.mk
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
commit	6f56ab789cb470620554d624c37f488285b3b04e	[log] [tgz]
author	Dan Albert <danalbert@google.com>	Tue May 06 14:12:12 2014 -0700
committer	Dan Albert <danalbert@google.com>	Mon May 12 16:02:43 2014 -0700
tree	94b24dad537044b02e3e4539356aecc22bd15499
parent	7d57f1bbe2a5e91a6ec904da37f36791856cb93c [diff]