diff --git a/test/Android.build.mk b/test/Android.build.mk
deleted file mode 100644
index aaceb8c..0000000
--- a/test/Android.build.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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.
-#
-COMMON_C_INCLUDES := \
-	external/libcxx/test/support \
-	external/libcxx/include \
-
-COMMON_CPPFLAGS := \
-	-std=c++11 \
-	-fexceptions \
-	-frtti \
-	-nostdinc++ \
-
-COMMON_DEPS := \
-	external/libcxx/test/Android.build.mk \
-	$(test_makefile) \
-
-include $(CLEAR_VARS)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(COMMON_DEPS)
-LOCAL_CLANG := true
-LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
-LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
-LOCAL_SHARED_LIBRARIES := libc++
-LOCAL_SYSTEM_SHARED_LIBRARIES := libc libm
-LOCAL_MODULE := libc++tests/$(test_name)
-LOCAL_SRC_FILES := $(test_src)
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_ADDITIONAL_DEPENDENCIES := $(COMMON_DEPS)
-LOCAL_CLANG := true
-LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
-LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
-LOCAL_LDFLAGS := -nodefaultlibs
-LOCAL_LDLIBS := -lc -lm -lpthread
-LOCAL_SHARED_LIBRARIES := libc++
-LOCAL_MODULE := libc++tests/$(test_name)
-LOCAL_SRC_FILES := $(test_src)
-include $(BUILD_HOST_EXECUTABLE)
diff --git a/test/Android.mk b/test/Android.mk
deleted file mode 100644
index 4a98f1a..0000000
--- a/test/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/Android.mk
-
-test_name := 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/algorithms/Android.mk b/test/algorithms/Android.mk
deleted file mode 100644
index 18f55ee..0000000
--- a/test/algorithms/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/algorithms/Android.mk
-
-test_name := algorithms/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/algorithms/alg.c.library/Android.mk b/test/algorithms/alg.c.library/Android.mk
deleted file mode 100644
index 1133ef9..0000000
--- a/test/algorithms/alg.c.library/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/algorithms/alg.c.library/Android.mk
-
-test_name := algorithms/alg.c.library/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/algorithms/alg.modifying.operations/Android.mk b/test/algorithms/alg.modifying.operations/Android.mk
deleted file mode 100644
index 6acde71..0000000
--- a/test/algorithms/alg.modifying.operations/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/algorithms/alg.modifying.operations/Android.mk
-
-test_name := algorithms/alg.modifying.operations/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/algorithms/alg.modifying.operations/alg.copy/Android.mk b/test/algorithms/alg.modifying.operations/alg.copy/Android.mk
deleted file mode 100644
index 6b272ad..0000000
--- a/test/algorithms/alg.modifying.operations/alg.copy/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/algorithms/alg.modifying.operations/alg.copy/Android.mk
-
-test_name := algorithms/alg.modifying.operations/alg.copy/copy_n
-test_src := copy_n.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.copy/copy_backward
-test_src := copy_backward.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.copy/copy_if
-test_src := copy_if.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.copy/copy
-test_src := 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/algorithms/alg.modifying.operations/alg.fill/Android.mk b/test/algorithms/alg.modifying.operations/alg.fill/Android.mk
deleted file mode 100644
index 049851c..0000000
--- a/test/algorithms/alg.modifying.operations/alg.fill/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.modifying.operations/alg.fill/Android.mk
-
-test_name := algorithms/alg.modifying.operations/alg.fill/fill_n
-test_src := fill_n.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.fill/fill
-test_src := fill.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/algorithms/alg.modifying.operations/alg.generate/Android.mk b/test/algorithms/alg.modifying.operations/alg.generate/Android.mk
deleted file mode 100644
index ad74862..0000000
--- a/test/algorithms/alg.modifying.operations/alg.generate/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.modifying.operations/alg.generate/Android.mk
-
-test_name := algorithms/alg.modifying.operations/alg.generate/generate_n
-test_src := generate_n.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.generate/generate
-test_src := generate.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/algorithms/alg.modifying.operations/alg.move/Android.mk b/test/algorithms/alg.modifying.operations/alg.move/Android.mk
deleted file mode 100644
index fa6bbe6..0000000
--- a/test/algorithms/alg.modifying.operations/alg.move/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.modifying.operations/alg.move/Android.mk
-
-test_name := algorithms/alg.modifying.operations/alg.move/move_backward
-test_src := move_backward.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.move/move
-test_src := move.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/algorithms/alg.modifying.operations/alg.partitions/Android.mk b/test/algorithms/alg.modifying.operations/alg.partitions/Android.mk
deleted file mode 100644
index d0dfde1..0000000
--- a/test/algorithms/alg.modifying.operations/alg.partitions/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/algorithms/alg.modifying.operations/alg.partitions/Android.mk
-
-test_name := algorithms/alg.modifying.operations/alg.partitions/partition
-test_src := partition.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.partitions/partition_copy
-test_src := partition_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.partitions/stable_partition
-test_src := stable_partition.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.partitions/is_partitioned
-test_src := is_partitioned.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.partitions/partition_point
-test_src := partition_point.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/algorithms/alg.modifying.operations/alg.random.shuffle/Android.mk b/test/algorithms/alg.modifying.operations/alg.random.shuffle/Android.mk
deleted file mode 100644
index d513134..0000000
--- a/test/algorithms/alg.modifying.operations/alg.random.shuffle/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/algorithms/alg.modifying.operations/alg.random.shuffle/Android.mk
-
-test_name := algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_rand
-test_src := random_shuffle_rand.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle
-test_src := random_shuffle.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_urng
-test_src := random_shuffle_urng.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/algorithms/alg.modifying.operations/alg.remove/Android.mk b/test/algorithms/alg.modifying.operations/alg.remove/Android.mk
deleted file mode 100644
index 82f3590..0000000
--- a/test/algorithms/alg.modifying.operations/alg.remove/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/algorithms/alg.modifying.operations/alg.remove/Android.mk
-
-test_name := algorithms/alg.modifying.operations/alg.remove/remove_copy_if
-test_src := remove_copy_if.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.remove/remove_copy
-test_src := remove_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.remove/remove
-test_src := remove.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.remove/remove_if
-test_src := remove_if.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/algorithms/alg.modifying.operations/alg.replace/Android.mk b/test/algorithms/alg.modifying.operations/alg.replace/Android.mk
deleted file mode 100644
index 9013a4d..0000000
--- a/test/algorithms/alg.modifying.operations/alg.replace/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/algorithms/alg.modifying.operations/alg.replace/Android.mk
-
-test_name := algorithms/alg.modifying.operations/alg.replace/replace_copy_if
-test_src := replace_copy_if.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.replace/replace_copy
-test_src := replace_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.replace/replace_if
-test_src := replace_if.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.replace/replace
-test_src := replace.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/algorithms/alg.modifying.operations/alg.reverse/Android.mk b/test/algorithms/alg.modifying.operations/alg.reverse/Android.mk
deleted file mode 100644
index 171bf0a..0000000
--- a/test/algorithms/alg.modifying.operations/alg.reverse/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.modifying.operations/alg.reverse/Android.mk
-
-test_name := algorithms/alg.modifying.operations/alg.reverse/reverse_copy
-test_src := reverse_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.reverse/reverse
-test_src := reverse.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/algorithms/alg.modifying.operations/alg.rotate/Android.mk b/test/algorithms/alg.modifying.operations/alg.rotate/Android.mk
deleted file mode 100644
index 2fca9ed..0000000
--- a/test/algorithms/alg.modifying.operations/alg.rotate/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.modifying.operations/alg.rotate/Android.mk
-
-test_name := algorithms/alg.modifying.operations/alg.rotate/rotate_copy
-test_src := rotate_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.rotate/rotate
-test_src := rotate.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/algorithms/alg.modifying.operations/alg.swap/Android.mk b/test/algorithms/alg.modifying.operations/alg.swap/Android.mk
deleted file mode 100644
index 4d218bf..0000000
--- a/test/algorithms/alg.modifying.operations/alg.swap/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.modifying.operations/alg.swap/Android.mk
-
-test_name := algorithms/alg.modifying.operations/alg.swap/iter_swap
-test_src := iter_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.swap/swap_ranges
-test_src := swap_ranges.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/algorithms/alg.modifying.operations/alg.transform/Android.mk b/test/algorithms/alg.modifying.operations/alg.transform/Android.mk
deleted file mode 100644
index ad1874d..0000000
--- a/test/algorithms/alg.modifying.operations/alg.transform/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.modifying.operations/alg.transform/Android.mk
-
-test_name := algorithms/alg.modifying.operations/alg.transform/unary_transform
-test_src := unary_transform.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.transform/binary_transform
-test_src := binary_transform.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/algorithms/alg.modifying.operations/alg.unique/Android.mk b/test/algorithms/alg.modifying.operations/alg.unique/Android.mk
deleted file mode 100644
index bf44a35..0000000
--- a/test/algorithms/alg.modifying.operations/alg.unique/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/algorithms/alg.modifying.operations/alg.unique/Android.mk
-
-test_name := algorithms/alg.modifying.operations/alg.unique/unique_pred
-test_src := unique_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.unique/unique_copy
-test_src := unique_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.unique/unique_copy_pred
-test_src := unique_copy_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.modifying.operations/alg.unique/unique
-test_src := unique.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/algorithms/alg.nonmodifying/Android.mk b/test/algorithms/alg.nonmodifying/Android.mk
deleted file mode 100644
index 096c1eb..0000000
--- a/test/algorithms/alg.nonmodifying/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/algorithms/alg.nonmodifying/Android.mk
-
-test_name := algorithms/alg.nonmodifying/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/algorithms/alg.nonmodifying/alg.adjacent.find/Android.mk b/test/algorithms/alg.nonmodifying/alg.adjacent.find/Android.mk
deleted file mode 100644
index 645f2e6..0000000
--- a/test/algorithms/alg.nonmodifying/alg.adjacent.find/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.nonmodifying/alg.adjacent.find/Android.mk
-
-test_name := algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred
-test_src := adjacent_find_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find
-test_src := adjacent_find.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/algorithms/alg.nonmodifying/alg.all_of/Android.mk b/test/algorithms/alg.nonmodifying/alg.all_of/Android.mk
deleted file mode 100644
index e3a89fd..0000000
--- a/test/algorithms/alg.nonmodifying/alg.all_of/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/algorithms/alg.nonmodifying/alg.all_of/Android.mk
-
-test_name := algorithms/alg.nonmodifying/alg.all_of/all_of
-test_src := all_of.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/algorithms/alg.nonmodifying/alg.any_of/Android.mk b/test/algorithms/alg.nonmodifying/alg.any_of/Android.mk
deleted file mode 100644
index 8189b1d..0000000
--- a/test/algorithms/alg.nonmodifying/alg.any_of/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/algorithms/alg.nonmodifying/alg.any_of/Android.mk
-
-test_name := algorithms/alg.nonmodifying/alg.any_of/any_of
-test_src := any_of.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/algorithms/alg.nonmodifying/alg.count/Android.mk b/test/algorithms/alg.nonmodifying/alg.count/Android.mk
deleted file mode 100644
index adebd16..0000000
--- a/test/algorithms/alg.nonmodifying/alg.count/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.nonmodifying/alg.count/Android.mk
-
-test_name := algorithms/alg.nonmodifying/alg.count/count_if
-test_src := count_if.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.nonmodifying/alg.count/count
-test_src := count.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/algorithms/alg.nonmodifying/alg.equal/Android.mk b/test/algorithms/alg.nonmodifying/alg.equal/Android.mk
deleted file mode 100644
index 2c721ed..0000000
--- a/test/algorithms/alg.nonmodifying/alg.equal/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.nonmodifying/alg.equal/Android.mk
-
-test_name := algorithms/alg.nonmodifying/alg.equal/equal_pred
-test_src := equal_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.nonmodifying/alg.equal/equal
-test_src := equal.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/algorithms/alg.nonmodifying/alg.find.end/Android.mk b/test/algorithms/alg.nonmodifying/alg.find.end/Android.mk
deleted file mode 100644
index 56b3347..0000000
--- a/test/algorithms/alg.nonmodifying/alg.find.end/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.nonmodifying/alg.find.end/Android.mk
-
-test_name := algorithms/alg.nonmodifying/alg.find.end/find_end
-test_src := find_end.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.nonmodifying/alg.find.end/find_end_pred
-test_src := find_end_pred.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/algorithms/alg.nonmodifying/alg.find.first.of/Android.mk b/test/algorithms/alg.nonmodifying/alg.find.first.of/Android.mk
deleted file mode 100644
index 2341310..0000000
--- a/test/algorithms/alg.nonmodifying/alg.find.first.of/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.nonmodifying/alg.find.first.of/Android.mk
-
-test_name := algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred
-test_src := find_first_of_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.nonmodifying/alg.find.first.of/find_first_of
-test_src := find_first_of.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/algorithms/alg.nonmodifying/alg.find/Android.mk b/test/algorithms/alg.nonmodifying/alg.find/Android.mk
deleted file mode 100644
index 10699fe..0000000
--- a/test/algorithms/alg.nonmodifying/alg.find/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/algorithms/alg.nonmodifying/alg.find/Android.mk
-
-test_name := algorithms/alg.nonmodifying/alg.find/find_if
-test_src := find_if.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.nonmodifying/alg.find/find
-test_src := find.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.nonmodifying/alg.find/find_if_not
-test_src := find_if_not.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/algorithms/alg.nonmodifying/alg.foreach/Android.mk b/test/algorithms/alg.nonmodifying/alg.foreach/Android.mk
deleted file mode 100644
index 4fbfa23..0000000
--- a/test/algorithms/alg.nonmodifying/alg.foreach/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/algorithms/alg.nonmodifying/alg.foreach/Android.mk
-
-test_name := algorithms/alg.nonmodifying/alg.foreach/test
-test_src := test.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/algorithms/alg.nonmodifying/alg.is_permutation/Android.mk b/test/algorithms/alg.nonmodifying/alg.is_permutation/Android.mk
deleted file mode 100644
index 8fd0ac0..0000000
--- a/test/algorithms/alg.nonmodifying/alg.is_permutation/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.nonmodifying/alg.is_permutation/Android.mk
-
-test_name := algorithms/alg.nonmodifying/alg.is_permutation/is_permutation
-test_src := is_permutation.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred
-test_src := is_permutation_pred.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/algorithms/alg.nonmodifying/alg.none_of/Android.mk b/test/algorithms/alg.nonmodifying/alg.none_of/Android.mk
deleted file mode 100644
index daf0a88..0000000
--- a/test/algorithms/alg.nonmodifying/alg.none_of/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/algorithms/alg.nonmodifying/alg.none_of/Android.mk
-
-test_name := algorithms/alg.nonmodifying/alg.none_of/none_of
-test_src := none_of.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/algorithms/alg.nonmodifying/alg.search/Android.mk b/test/algorithms/alg.nonmodifying/alg.search/Android.mk
deleted file mode 100644
index d43e65a..0000000
--- a/test/algorithms/alg.nonmodifying/alg.search/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/algorithms/alg.nonmodifying/alg.search/Android.mk
-
-test_name := algorithms/alg.nonmodifying/alg.search/search
-test_src := search.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.nonmodifying/alg.search/search_n
-test_src := search_n.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.nonmodifying/alg.search/search_n_pred
-test_src := search_n_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.nonmodifying/alg.search/search_pred
-test_src := search_pred.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/algorithms/alg.nonmodifying/mismatch/Android.mk b/test/algorithms/alg.nonmodifying/mismatch/Android.mk
deleted file mode 100644
index 14cc8e2..0000000
--- a/test/algorithms/alg.nonmodifying/mismatch/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.nonmodifying/mismatch/Android.mk
-
-test_name := algorithms/alg.nonmodifying/mismatch/mismatch_pred
-test_src := mismatch_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.nonmodifying/mismatch/mismatch
-test_src := mismatch.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/algorithms/alg.sorting/Android.mk b/test/algorithms/alg.sorting/Android.mk
deleted file mode 100644
index 0d06577..0000000
--- a/test/algorithms/alg.sorting/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/algorithms/alg.sorting/Android.mk
-
-test_name := algorithms/alg.sorting/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/algorithms/alg.sorting/alg.binary.search/Android.mk b/test/algorithms/alg.sorting/alg.binary.search/Android.mk
deleted file mode 100644
index a8a35d7..0000000
--- a/test/algorithms/alg.sorting/alg.binary.search/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.binary.search/Android.mk
-
-test_name := algorithms/alg.sorting/alg.binary.search/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/algorithms/alg.sorting/alg.binary.search/binary.search/Android.mk b/test/algorithms/alg.sorting/alg.binary.search/binary.search/Android.mk
deleted file mode 100644
index 22f8e7e..0000000
--- a/test/algorithms/alg.sorting/alg.binary.search/binary.search/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.binary.search/binary.search/Android.mk
-
-test_name := algorithms/alg.sorting/alg.binary.search/binary.search/binary_search
-test_src := binary_search.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp
-test_src := binary_search_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/algorithms/alg.sorting/alg.binary.search/equal.range/Android.mk b/test/algorithms/alg.sorting/alg.binary.search/equal.range/Android.mk
deleted file mode 100644
index 9d1585a..0000000
--- a/test/algorithms/alg.sorting/alg.binary.search/equal.range/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.binary.search/equal.range/Android.mk
-
-test_name := algorithms/alg.sorting/alg.binary.search/equal.range/equal_range
-test_src := equal_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp
-test_src := equal_range_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/algorithms/alg.sorting/alg.binary.search/lower.bound/Android.mk b/test/algorithms/alg.sorting/alg.binary.search/lower.bound/Android.mk
deleted file mode 100644
index 5338a75..0000000
--- a/test/algorithms/alg.sorting/alg.binary.search/lower.bound/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.binary.search/lower.bound/Android.mk
-
-test_name := algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound
-test_src := lower_bound.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp
-test_src := lower_bound_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/algorithms/alg.sorting/alg.binary.search/upper.bound/Android.mk b/test/algorithms/alg.sorting/alg.binary.search/upper.bound/Android.mk
deleted file mode 100644
index 7cfcbbd..0000000
--- a/test/algorithms/alg.sorting/alg.binary.search/upper.bound/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.binary.search/upper.bound/Android.mk
-
-test_name := algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound
-test_src := upper_bound.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp
-test_src := upper_bound_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/algorithms/alg.sorting/alg.heap.operations/Android.mk b/test/algorithms/alg.sorting/alg.heap.operations/Android.mk
deleted file mode 100644
index 474158f..0000000
--- a/test/algorithms/alg.sorting/alg.heap.operations/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.heap.operations/Android.mk
-
-test_name := algorithms/alg.sorting/alg.heap.operations/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/algorithms/alg.sorting/alg.heap.operations/is.heap/Android.mk b/test/algorithms/alg.sorting/alg.heap.operations/is.heap/Android.mk
deleted file mode 100644
index 9c03d9d..0000000
--- a/test/algorithms/alg.sorting/alg.heap.operations/is.heap/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.heap.operations/is.heap/Android.mk
-
-test_name := algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until
-test_src := is_heap_until.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp
-test_src := is_heap_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap
-test_src := is_heap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp
-test_src := is_heap_until_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/algorithms/alg.sorting/alg.heap.operations/make.heap/Android.mk b/test/algorithms/alg.sorting/alg.heap.operations/make.heap/Android.mk
deleted file mode 100644
index 82dbd00..0000000
--- a/test/algorithms/alg.sorting/alg.heap.operations/make.heap/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.heap.operations/make.heap/Android.mk
-
-test_name := algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap
-test_src := make_heap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp
-test_src := make_heap_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/algorithms/alg.sorting/alg.heap.operations/pop.heap/Android.mk b/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/Android.mk
deleted file mode 100644
index 2c305a8..0000000
--- a/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.heap.operations/pop.heap/Android.mk
-
-test_name := algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap
-test_src := pop_heap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp
-test_src := pop_heap_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/algorithms/alg.sorting/alg.heap.operations/push.heap/Android.mk b/test/algorithms/alg.sorting/alg.heap.operations/push.heap/Android.mk
deleted file mode 100644
index c9f1191..0000000
--- a/test/algorithms/alg.sorting/alg.heap.operations/push.heap/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.heap.operations/push.heap/Android.mk
-
-test_name := algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp
-test_src := push_heap_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap
-test_src := push_heap.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/algorithms/alg.sorting/alg.heap.operations/sort.heap/Android.mk b/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/Android.mk
deleted file mode 100644
index 289e2e4..0000000
--- a/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.heap.operations/sort.heap/Android.mk
-
-test_name := algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap
-test_src := sort_heap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp
-test_src := sort_heap_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/algorithms/alg.sorting/alg.lex.comparison/Android.mk b/test/algorithms/alg.sorting/alg.lex.comparison/Android.mk
deleted file mode 100644
index f2c9a17..0000000
--- a/test/algorithms/alg.sorting/alg.lex.comparison/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.lex.comparison/Android.mk
-
-test_name := algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp
-test_src := lexicographical_compare_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare
-test_src := lexicographical_compare.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/algorithms/alg.sorting/alg.merge/Android.mk b/test/algorithms/alg.sorting/alg.merge/Android.mk
deleted file mode 100644
index baab48b..0000000
--- a/test/algorithms/alg.sorting/alg.merge/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.merge/Android.mk
-
-test_name := algorithms/alg.sorting/alg.merge/inplace_merge_comp
-test_src := inplace_merge_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.merge/merge
-test_src := merge.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.merge/inplace_merge
-test_src := inplace_merge.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.merge/merge_comp
-test_src := merge_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/algorithms/alg.sorting/alg.min.max/Android.mk b/test/algorithms/alg.sorting/alg.min.max/Android.mk
deleted file mode 100644
index 824e663..0000000
--- a/test/algorithms/alg.sorting/alg.min.max/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.min.max/Android.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/max_element
-test_src := max_element.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/minmax_init_list_comp
-test_src := minmax_init_list_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/min_element_comp
-test_src := min_element_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/min_comp
-test_src := min_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/minmax_element
-test_src := minmax_element.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/minmax_init_list
-test_src := minmax_init_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/min
-test_src := min.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/minmax
-test_src := minmax.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/max_comp
-test_src := max_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/max_init_list
-test_src := max_init_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/minmax_comp
-test_src := minmax_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/max_init_list_comp
-test_src := max_init_list_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/min_init_list_comp
-test_src := min_init_list_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/min_element
-test_src := min_element.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/min_init_list
-test_src := min_init_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/max
-test_src := max.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/max_element_comp
-test_src := max_element_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.min.max/minmax_element_comp
-test_src := minmax_element_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/algorithms/alg.sorting/alg.nth.element/Android.mk b/test/algorithms/alg.sorting/alg.nth.element/Android.mk
deleted file mode 100644
index 080e140..0000000
--- a/test/algorithms/alg.sorting/alg.nth.element/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.nth.element/Android.mk
-
-test_name := algorithms/alg.sorting/alg.nth.element/nth_element
-test_src := nth_element.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.nth.element/nth_element_comp
-test_src := nth_element_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/algorithms/alg.sorting/alg.permutation.generators/Android.mk b/test/algorithms/alg.sorting/alg.permutation.generators/Android.mk
deleted file mode 100644
index 20c35e2..0000000
--- a/test/algorithms/alg.sorting/alg.permutation.generators/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.permutation.generators/Android.mk
-
-test_name := algorithms/alg.sorting/alg.permutation.generators/next_permutation
-test_src := next_permutation.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp
-test_src := next_permutation_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp
-test_src := prev_permutation_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.permutation.generators/prev_permutation
-test_src := prev_permutation.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/algorithms/alg.sorting/alg.set.operations/Android.mk b/test/algorithms/alg.sorting/alg.set.operations/Android.mk
deleted file mode 100644
index 961de82..0000000
--- a/test/algorithms/alg.sorting/alg.set.operations/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.set.operations/Android.mk
-
-test_name := algorithms/alg.sorting/alg.set.operations/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/algorithms/alg.sorting/alg.set.operations/includes/Android.mk b/test/algorithms/alg.sorting/alg.set.operations/includes/Android.mk
deleted file mode 100644
index 38f34ce..0000000
--- a/test/algorithms/alg.sorting/alg.set.operations/includes/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.set.operations/includes/Android.mk
-
-test_name := algorithms/alg.sorting/alg.set.operations/includes/includes
-test_src := includes.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.set.operations/includes/includes_comp
-test_src := includes_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/algorithms/alg.sorting/alg.set.operations/set.difference/Android.mk b/test/algorithms/alg.sorting/alg.set.operations/set.difference/Android.mk
deleted file mode 100644
index e7c2046..0000000
--- a/test/algorithms/alg.sorting/alg.set.operations/set.difference/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.set.operations/set.difference/Android.mk
-
-test_name := algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp
-test_src := set_difference_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.set.operations/set.difference/set_difference
-test_src := set_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/algorithms/alg.sorting/alg.set.operations/set.intersection/Android.mk b/test/algorithms/alg.sorting/alg.set.operations/set.intersection/Android.mk
deleted file mode 100644
index 9e11fb9..0000000
--- a/test/algorithms/alg.sorting/alg.set.operations/set.intersection/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.set.operations/set.intersection/Android.mk
-
-test_name := algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp
-test_src := set_intersection_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection
-test_src := set_intersection.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/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/Android.mk b/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/Android.mk
deleted file mode 100644
index 577f96d..0000000
--- a/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/Android.mk
-
-test_name := algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference
-test_src := set_symmetric_difference.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp
-test_src := set_symmetric_difference_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/algorithms/alg.sorting/alg.set.operations/set.union/Android.mk b/test/algorithms/alg.sorting/alg.set.operations/set.union/Android.mk
deleted file mode 100644
index be201d3..0000000
--- a/test/algorithms/alg.sorting/alg.set.operations/set.union/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.set.operations/set.union/Android.mk
-
-test_name := algorithms/alg.sorting/alg.set.operations/set.union/set_union
-test_src := set_union.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp
-test_src := set_union_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/algorithms/alg.sorting/alg.sort/Android.mk b/test/algorithms/alg.sorting/alg.sort/Android.mk
deleted file mode 100644
index 99e39ce..0000000
--- a/test/algorithms/alg.sorting/alg.sort/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.sort/Android.mk
-
-test_name := algorithms/alg.sorting/alg.sort/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/algorithms/alg.sorting/alg.sort/is.sorted/Android.mk b/test/algorithms/alg.sorting/alg.sort/is.sorted/Android.mk
deleted file mode 100644
index 0f16cb6..0000000
--- a/test/algorithms/alg.sorting/alg.sort/is.sorted/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.sort/is.sorted/Android.mk
-
-test_name := algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until
-test_src := is_sorted_until.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp
-test_src := is_sorted_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.sort/is.sorted/is_sorted
-test_src := is_sorted.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp
-test_src := is_sorted_until_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/algorithms/alg.sorting/alg.sort/partial.sort.copy/Android.mk b/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/Android.mk
deleted file mode 100644
index 11d0bce..0000000
--- a/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.sort/partial.sort.copy/Android.mk
-
-test_name := algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy
-test_src := partial_sort_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp
-test_src := partial_sort_copy_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/algorithms/alg.sorting/alg.sort/partial.sort/Android.mk b/test/algorithms/alg.sorting/alg.sort/partial.sort/Android.mk
deleted file mode 100644
index 3013c91..0000000
--- a/test/algorithms/alg.sorting/alg.sort/partial.sort/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.sort/partial.sort/Android.mk
-
-test_name := algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp
-test_src := partial_sort_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.sort/partial.sort/partial_sort
-test_src := partial_sort.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/algorithms/alg.sorting/alg.sort/sort/Android.mk b/test/algorithms/alg.sorting/alg.sort/sort/Android.mk
deleted file mode 100644
index 044b414..0000000
--- a/test/algorithms/alg.sorting/alg.sort/sort/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.sort/sort/Android.mk
-
-test_name := algorithms/alg.sorting/alg.sort/sort/sort
-test_src := sort.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.sort/sort/sort_comp
-test_src := sort_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/algorithms/alg.sorting/alg.sort/stable.sort/Android.mk b/test/algorithms/alg.sorting/alg.sort/stable.sort/Android.mk
deleted file mode 100644
index 0d1b774..0000000
--- a/test/algorithms/alg.sorting/alg.sort/stable.sort/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/algorithms/alg.sorting/alg.sort/stable.sort/Android.mk
-
-test_name := algorithms/alg.sorting/alg.sort/stable.sort/stable_sort
-test_src := stable_sort.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := algorithms/alg.sorting/alg.sort/stable.sort/stable_sort_comp
-test_src := stable_sort_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/algorithms/algorithms.general/Android.mk b/test/algorithms/algorithms.general/Android.mk
deleted file mode 100644
index 9713b89..0000000
--- a/test/algorithms/algorithms.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/algorithms/algorithms.general/Android.mk
-
-test_name := algorithms/algorithms.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/atomics/Android.mk b/test/atomics/Android.mk
deleted file mode 100644
index b14628a..0000000
--- a/test/atomics/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/atomics/Android.mk
-
-test_name := atomics/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/atomics/atomics.fences/Android.mk b/test/atomics/atomics.fences/Android.mk
deleted file mode 100644
index 3a4cc6c..0000000
--- a/test/atomics/atomics.fences/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/atomics/atomics.fences/Android.mk
-
-test_name := atomics/atomics.fences/atomic_signal_fence
-test_src := atomic_signal_fence.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.fences/atomic_thread_fence
-test_src := atomic_thread_fence.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/atomics/atomics.flag/Android.mk b/test/atomics/atomics.flag/Android.mk
deleted file mode 100644
index 72bdc0d..0000000
--- a/test/atomics/atomics.flag/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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/atomics/atomics.flag/Android.mk
-
-test_name := atomics/atomics.flag/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.flag/atomic_flag_clear
-test_src := atomic_flag_clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.flag/atomic_flag_test_and_set_explicit
-test_src := atomic_flag_test_and_set_explicit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.flag/atomic_flag_test_and_set
-test_src := atomic_flag_test_and_set.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.flag/init
-test_src := init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.flag/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.flag/test_and_set
-test_src := test_and_set.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.flag/atomic_flag_clear_explicit
-test_src := atomic_flag_clear_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/atomics/atomics.general/Android.mk b/test/atomics/atomics.general/Android.mk
deleted file mode 100644
index 739f360..0000000
--- a/test/atomics/atomics.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/atomics/atomics.general/Android.mk
-
-test_name := atomics/atomics.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/atomics/atomics.lockfree/Android.mk b/test/atomics/atomics.lockfree/Android.mk
deleted file mode 100644
index c71aa61..0000000
--- a/test/atomics/atomics.lockfree/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/atomics/atomics.lockfree/Android.mk
-
-test_name := atomics/atomics.lockfree/lockfree
-test_src := lockfree.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/atomics/atomics.order/Android.mk b/test/atomics/atomics.order/Android.mk
deleted file mode 100644
index f715de1..0000000
--- a/test/atomics/atomics.order/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/atomics/atomics.order/Android.mk
-
-test_name := atomics/atomics.order/memory_order
-test_src := memory_order.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.order/kill_dependency
-test_src := kill_dependency.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/atomics/atomics.syn/Android.mk b/test/atomics/atomics.syn/Android.mk
deleted file mode 100644
index 1027210..0000000
--- a/test/atomics/atomics.syn/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/atomics/atomics.syn/Android.mk
-
-test_name := atomics/atomics.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/atomics/atomics.types.generic/Android.mk b/test/atomics/atomics.types.generic/Android.mk
deleted file mode 100644
index 9d65d6e..0000000
--- a/test/atomics/atomics.types.generic/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/atomics/atomics.types.generic/Android.mk
-
-test_name := atomics/atomics.types.generic/address
-test_src := address.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.generic/bool
-test_src := bool.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.generic/cstdint_typedefs
-test_src := cstdint_typedefs.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.generic/integral_typedefs
-test_src := integral_typedefs.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.generic/integral
-test_src := integral.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/atomics/atomics.types.operations/Android.mk b/test/atomics/atomics.types.operations/Android.mk
deleted file mode 100644
index 6022a1a..0000000
--- a/test/atomics/atomics.types.operations/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/atomics/atomics.types.operations/Android.mk
-
-test_name := atomics/atomics.types.operations/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/atomics/atomics.types.operations/atomics.types.operations.arith/Android.mk b/test/atomics/atomics.types.operations/atomics.types.operations.arith/Android.mk
deleted file mode 100644
index fb97c07..0000000
--- a/test/atomics/atomics.types.operations/atomics.types.operations.arith/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/atomics/atomics.types.operations/atomics.types.operations.arith/Android.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.arith/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/atomics/atomics.types.operations/atomics.types.operations.general/Android.mk b/test/atomics/atomics.types.operations/atomics.types.operations.general/Android.mk
deleted file mode 100644
index 4655407..0000000
--- a/test/atomics/atomics.types.operations/atomics.types.operations.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/atomics/atomics.types.operations/atomics.types.operations.general/Android.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.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/atomics/atomics.types.operations/atomics.types.operations.pointer/Android.mk b/test/atomics/atomics.types.operations/atomics.types.operations.pointer/Android.mk
deleted file mode 100644
index 2c43869..0000000
--- a/test/atomics/atomics.types.operations/atomics.types.operations.pointer/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/atomics/atomics.types.operations/atomics.types.operations.pointer/Android.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.pointer/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/atomics/atomics.types.operations/atomics.types.operations.req/Android.mk b/test/atomics/atomics.types.operations/atomics.types.operations.req/Android.mk
deleted file mode 100644
index fd880a0..0000000
--- a/test/atomics/atomics.types.operations/atomics.types.operations.req/Android.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# 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/atomics/atomics.types.operations/atomics.types.operations.req/Android.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or
-test_src := atomic_fetch_or.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit
-test_src := atomic_compare_exchange_strong_explicit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange
-test_src := atomic_exchange.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit
-test_src := atomic_compare_exchange_weak_explicit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit
-test_src := atomic_fetch_or_explicit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit
-test_src := atomic_fetch_add_explicit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_is_lock_free
-test_src := atomic_is_lock_free.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit
-test_src := atomic_fetch_sub_explicit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_init
-test_src := atomic_init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_store
-test_src := atomic_store.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_load
-test_src := atomic_load.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit
-test_src := atomic_load_explicit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit
-test_src := atomic_store_explicit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and
-test_src := atomic_fetch_and.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add
-test_src := atomic_fetch_add.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub
-test_src := atomic_fetch_sub.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak
-test_src := atomic_compare_exchange_weak.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init
-test_src := atomic_var_init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong
-test_src := atomic_compare_exchange_strong.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit
-test_src := atomic_exchange_explicit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor
-test_src := atomic_fetch_xor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit
-test_src := atomic_fetch_and_explicit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit
-test_src := atomic_fetch_xor_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/atomics/atomics.types.operations/atomics.types.operations.templ/Android.mk b/test/atomics/atomics.types.operations/atomics.types.operations.templ/Android.mk
deleted file mode 100644
index ec16339..0000000
--- a/test/atomics/atomics.types.operations/atomics.types.operations.templ/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/atomics/atomics.types.operations/atomics.types.operations.templ/Android.mk
-
-test_name := atomics/atomics.types.operations/atomics.types.operations.templ/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/containers/Android.mk b/test/containers/Android.mk
deleted file mode 100644
index 0b54e85..0000000
--- a/test/containers/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/Android.mk
-
-test_name := containers/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/containers/associative/Android.mk b/test/containers/associative/Android.mk
deleted file mode 100644
index 305db47..0000000
--- a/test/containers/associative/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/containers/associative/Android.mk
-
-test_name := containers/associative/tree_left_rotate
-test_src := tree_left_rotate.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/tree_remove
-test_src := tree_remove.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/tree_balance_after_insert
-test_src := tree_balance_after_insert.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/tree_right_rotate
-test_src := tree_right_rotate.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/containers/associative/map/Android.mk b/test/containers/associative/map/Android.mk
deleted file mode 100644
index b4d26f4..0000000
--- a/test/containers/associative/map/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/containers/associative/map/Android.mk
-
-test_name := containers/associative/map/compare
-test_src := compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/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/containers/associative/map/map.access/Android.mk b/test/containers/associative/map/map.access/Android.mk
deleted file mode 100644
index 98f1edf..0000000
--- a/test/containers/associative/map/map.access/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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/containers/associative/map/map.access/Android.mk
-
-test_name := containers/associative/map/map.access/index_rv_key
-test_src := index_rv_key.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.access/at
-test_src := at.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.access/iterator
-test_src := iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.access/index_tuple
-test_src := index_tuple.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.access/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.access/max_size
-test_src := max_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.access/empty
-test_src := empty.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.access/index_key
-test_src := index_key.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/containers/associative/map/map.cons/Android.mk b/test/containers/associative/map/map.cons/Android.mk
deleted file mode 100644
index a5200fa..0000000
--- a/test/containers/associative/map/map.cons/Android.mk
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# 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/containers/associative/map/map.cons/Android.mk
-
-test_name := containers/associative/map/map.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/compare
-test_src := compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/alloc
-test_src := alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/iter_iter
-test_src := iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/iter_iter_comp
-test_src := iter_iter_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/assign_initializer_list
-test_src := assign_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/copy_alloc
-test_src := copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/move_assign
-test_src := move_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/initializer_list_compare
-test_src := initializer_list_compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/iter_iter_comp_alloc
-test_src := iter_iter_comp_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/copy_assign
-test_src := copy_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/default_recursive
-test_src := default_recursive.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/compare_alloc
-test_src := compare_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/initializer_list
-test_src := initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/initializer_list_compare_alloc
-test_src := initializer_list_compare_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.cons/move_alloc
-test_src := move_alloc.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/containers/associative/map/map.modifiers/Android.mk b/test/containers/associative/map/map.modifiers/Android.mk
deleted file mode 100644
index 3617cb6..0000000
--- a/test/containers/associative/map/map.modifiers/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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/containers/associative/map/map.modifiers/Android.mk
-
-test_name := containers/associative/map/map.modifiers/insert_cv
-test_src := insert_cv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.modifiers/insert_rv
-test_src := insert_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.modifiers/emplace_hint
-test_src := emplace_hint.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.modifiers/insert_initializer_list
-test_src := insert_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.modifiers/insert_iter_iter
-test_src := insert_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.modifiers/erase_key
-test_src := erase_key.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.modifiers/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.modifiers/insert_iter_rv
-test_src := insert_iter_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.modifiers/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.modifiers/erase_iter
-test_src := erase_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.modifiers/erase_iter_iter
-test_src := erase_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.modifiers/insert_iter_cv
-test_src := insert_iter_cv.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/containers/associative/map/map.ops/Android.mk b/test/containers/associative/map/map.ops/Android.mk
deleted file mode 100644
index 453335a..0000000
--- a/test/containers/associative/map/map.ops/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/containers/associative/map/map.ops/Android.mk
-
-test_name := containers/associative/map/map.ops/find
-test_src := find.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.ops/equal_range
-test_src := equal_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.ops/lower_bound
-test_src := lower_bound.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.ops/upper_bound
-test_src := upper_bound.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.ops/count
-test_src := count.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/containers/associative/map/map.special/Android.mk b/test/containers/associative/map/map.special/Android.mk
deleted file mode 100644
index dff116e..0000000
--- a/test/containers/associative/map/map.special/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/containers/associative/map/map.special/Android.mk
-
-test_name := containers/associative/map/map.special/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.special/swap_noexcept
-test_src := swap_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/map/map.special/non_member_swap
-test_src := non_member_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/containers/associative/multimap/Android.mk b/test/containers/associative/multimap/Android.mk
deleted file mode 100644
index 6ea3b8b..0000000
--- a/test/containers/associative/multimap/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/containers/associative/multimap/Android.mk
-
-test_name := containers/associative/multimap/iterator
-test_src := iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/max_size
-test_src := max_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/scary
-test_src := scary.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/empty
-test_src := empty.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/containers/associative/multimap/multimap.cons/Android.mk b/test/containers/associative/multimap/multimap.cons/Android.mk
deleted file mode 100644
index 81b41ef..0000000
--- a/test/containers/associative/multimap/multimap.cons/Android.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# 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/containers/associative/multimap/multimap.cons/Android.mk
-
-test_name := containers/associative/multimap/multimap.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/compare
-test_src := compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/alloc
-test_src := alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/iter_iter
-test_src := iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/iter_iter_comp
-test_src := iter_iter_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/assign_initializer_list
-test_src := assign_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/copy_alloc
-test_src := copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/move_assign
-test_src := move_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/initializer_list_compare
-test_src := initializer_list_compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/iter_iter_comp_alloc
-test_src := iter_iter_comp_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/copy_assign
-test_src := copy_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/compare_alloc
-test_src := compare_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/initializer_list
-test_src := initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/initializer_list_compare_alloc
-test_src := initializer_list_compare_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.cons/move_alloc
-test_src := move_alloc.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/containers/associative/multimap/multimap.modifiers/Android.mk b/test/containers/associative/multimap/multimap.modifiers/Android.mk
deleted file mode 100644
index cea03e2..0000000
--- a/test/containers/associative/multimap/multimap.modifiers/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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/containers/associative/multimap/multimap.modifiers/Android.mk
-
-test_name := containers/associative/multimap/multimap.modifiers/insert_cv
-test_src := insert_cv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.modifiers/insert_rv
-test_src := insert_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.modifiers/emplace_hint
-test_src := emplace_hint.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.modifiers/insert_initializer_list
-test_src := insert_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.modifiers/insert_iter_iter
-test_src := insert_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.modifiers/erase_key
-test_src := erase_key.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.modifiers/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.modifiers/insert_iter_rv
-test_src := insert_iter_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.modifiers/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.modifiers/erase_iter
-test_src := erase_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.modifiers/erase_iter_iter
-test_src := erase_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.modifiers/insert_iter_cv
-test_src := insert_iter_cv.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/containers/associative/multimap/multimap.ops/Android.mk b/test/containers/associative/multimap/multimap.ops/Android.mk
deleted file mode 100644
index 4fe5769..0000000
--- a/test/containers/associative/multimap/multimap.ops/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/containers/associative/multimap/multimap.ops/Android.mk
-
-test_name := containers/associative/multimap/multimap.ops/find
-test_src := find.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.ops/equal_range
-test_src := equal_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.ops/lower_bound
-test_src := lower_bound.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.ops/upper_bound
-test_src := upper_bound.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.ops/count
-test_src := count.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/containers/associative/multimap/multimap.special/Android.mk b/test/containers/associative/multimap/multimap.special/Android.mk
deleted file mode 100644
index bd36607..0000000
--- a/test/containers/associative/multimap/multimap.special/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/containers/associative/multimap/multimap.special/Android.mk
-
-test_name := containers/associative/multimap/multimap.special/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.special/swap_noexcept
-test_src := swap_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multimap/multimap.special/non_member_swap
-test_src := non_member_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/containers/associative/multiset/Android.mk b/test/containers/associative/multiset/Android.mk
deleted file mode 100644
index 1f87940..0000000
--- a/test/containers/associative/multiset/Android.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# 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/containers/associative/multiset/Android.mk
-
-test_name := containers/associative/multiset/insert_cv
-test_src := insert_cv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/insert_rv
-test_src := insert_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/find
-test_src := find.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/emplace_hint
-test_src := emplace_hint.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/insert_initializer_list
-test_src := insert_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/equal_range
-test_src := equal_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/lower_bound
-test_src := lower_bound.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/insert_iter_iter
-test_src := insert_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/erase_key
-test_src := erase_key.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/iterator
-test_src := iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/insert_iter_rv
-test_src := insert_iter_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/max_size
-test_src := max_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/scary
-test_src := scary.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/upper_bound
-test_src := upper_bound.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/erase_iter
-test_src := erase_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/erase_iter_iter
-test_src := erase_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/count
-test_src := count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/empty
-test_src := empty.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/insert_iter_cv
-test_src := insert_iter_cv.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/containers/associative/multiset/multiset.cons/Android.mk b/test/containers/associative/multiset/multiset.cons/Android.mk
deleted file mode 100644
index 72c4358..0000000
--- a/test/containers/associative/multiset/multiset.cons/Android.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# 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/containers/associative/multiset/multiset.cons/Android.mk
-
-test_name := containers/associative/multiset/multiset.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/compare
-test_src := compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/alloc
-test_src := alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/iter_iter
-test_src := iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/iter_iter_comp
-test_src := iter_iter_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/assign_initializer_list
-test_src := assign_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/copy_alloc
-test_src := copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/iter_iter_alloc
-test_src := iter_iter_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/move_assign
-test_src := move_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/initializer_list_compare
-test_src := initializer_list_compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/copy_assign
-test_src := copy_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/compare_alloc
-test_src := compare_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/initializer_list
-test_src := initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/initializer_list_compare_alloc
-test_src := initializer_list_compare_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.cons/move_alloc
-test_src := move_alloc.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/containers/associative/multiset/multiset.special/Android.mk b/test/containers/associative/multiset/multiset.special/Android.mk
deleted file mode 100644
index 8999ffa..0000000
--- a/test/containers/associative/multiset/multiset.special/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/containers/associative/multiset/multiset.special/Android.mk
-
-test_name := containers/associative/multiset/multiset.special/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.special/swap_noexcept
-test_src := swap_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/multiset/multiset.special/non_member_swap
-test_src := non_member_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/containers/associative/set/Android.mk b/test/containers/associative/set/Android.mk
deleted file mode 100644
index f3340fd..0000000
--- a/test/containers/associative/set/Android.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# 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/containers/associative/set/Android.mk
-
-test_name := containers/associative/set/insert_cv
-test_src := insert_cv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/insert_rv
-test_src := insert_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/find
-test_src := find.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/emplace_hint
-test_src := emplace_hint.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/insert_initializer_list
-test_src := insert_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/equal_range
-test_src := equal_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/lower_bound
-test_src := lower_bound.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/insert_iter_iter
-test_src := insert_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/erase_key
-test_src := erase_key.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/iterator
-test_src := iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/insert_iter_rv
-test_src := insert_iter_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/max_size
-test_src := max_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/upper_bound
-test_src := upper_bound.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/erase_iter
-test_src := erase_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/erase_iter_iter
-test_src := erase_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/count
-test_src := count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/empty
-test_src := empty.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/insert_iter_cv
-test_src := insert_iter_cv.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/containers/associative/set/set.cons/Android.mk b/test/containers/associative/set/set.cons/Android.mk
deleted file mode 100644
index 3d55238..0000000
--- a/test/containers/associative/set/set.cons/Android.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# 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/containers/associative/set/set.cons/Android.mk
-
-test_name := containers/associative/set/set.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/compare
-test_src := compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/alloc
-test_src := alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/iter_iter
-test_src := iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/iter_iter_comp
-test_src := iter_iter_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/assign_initializer_list
-test_src := assign_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/copy_alloc
-test_src := copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/iter_iter_alloc
-test_src := iter_iter_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/move_assign
-test_src := move_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/initializer_list_compare
-test_src := initializer_list_compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/copy_assign
-test_src := copy_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/compare_alloc
-test_src := compare_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/initializer_list
-test_src := initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/initializer_list_compare_alloc
-test_src := initializer_list_compare_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.cons/move_alloc
-test_src := move_alloc.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/containers/associative/set/set.special/Android.mk b/test/containers/associative/set/set.special/Android.mk
deleted file mode 100644
index 5c06bce..0000000
--- a/test/containers/associative/set/set.special/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/containers/associative/set/set.special/Android.mk
-
-test_name := containers/associative/set/set.special/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.special/swap_noexcept
-test_src := swap_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/associative/set/set.special/non_member_swap
-test_src := non_member_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/containers/container.adaptors/Android.mk b/test/containers/container.adaptors/Android.mk
deleted file mode 100644
index 41b49d0..0000000
--- a/test/containers/container.adaptors/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/container.adaptors/Android.mk
-
-test_name := containers/container.adaptors/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/containers/container.adaptors/priority.queue/Android.mk b/test/containers/container.adaptors/priority.queue/Android.mk
deleted file mode 100644
index 6684010..0000000
--- a/test/containers/container.adaptors/priority.queue/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/container.adaptors/priority.queue/Android.mk
-
-test_name := containers/container.adaptors/priority.queue/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/containers/container.adaptors/priority.queue/priqueue.cons.alloc/Android.mk b/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/Android.mk
deleted file mode 100644
index c6dd83d..0000000
--- a/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/containers/container.adaptors/priority.queue/priqueue.cons.alloc/Android.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc
-test_src := ctor_move_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc
-test_src := ctor_comp_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc
-test_src := ctor_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc
-test_src := ctor_copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc
-test_src := ctor_comp_rcont_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc
-test_src := ctor_comp_cont_alloc.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/containers/container.adaptors/priority.queue/priqueue.cons/Android.mk b/test/containers/container.adaptors/priority.queue/priqueue.cons/Android.mk
deleted file mode 100644
index 5d4a4d7..0000000
--- a/test/containers/container.adaptors/priority.queue/priqueue.cons/Android.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# 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/containers/container.adaptors/priority.queue/priqueue.cons/Android.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/ctor_copy
-test_src := ctor_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_cont
-test_src := ctor_iter_iter_comp_cont.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/assign_copy
-test_src := assign_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp
-test_src := ctor_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter
-test_src := ctor_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp
-test_src := ctor_iter_iter_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_container
-test_src := ctor_comp_container.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/ctor_move
-test_src := ctor_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer
-test_src := ctor_comp_rcontainer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/assign_move
-test_src := assign_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/ctor_default
-test_src := ctor_default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont
-test_src := ctor_iter_iter_comp_rcont.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/containers/container.adaptors/priority.queue/priqueue.members/Android.mk b/test/containers/container.adaptors/priority.queue/priqueue.members/Android.mk
deleted file mode 100644
index 36ed3e6..0000000
--- a/test/containers/container.adaptors/priority.queue/priqueue.members/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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/containers/container.adaptors/priority.queue/priqueue.members/Android.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.members/push
-test_src := push.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.members/top
-test_src := top.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.members/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.members/pop
-test_src := pop.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.members/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.members/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.members/push_rvalue
-test_src := push_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.members/empty
-test_src := empty.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/containers/container.adaptors/priority.queue/priqueue.special/Android.mk b/test/containers/container.adaptors/priority.queue/priqueue.special/Android.mk
deleted file mode 100644
index dc1355e..0000000
--- a/test/containers/container.adaptors/priority.queue/priqueue.special/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/containers/container.adaptors/priority.queue/priqueue.special/Android.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.special/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept
-test_src := swap_noexcept.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/containers/container.adaptors/queue/Android.mk b/test/containers/container.adaptors/queue/Android.mk
deleted file mode 100644
index 29d9174..0000000
--- a/test/containers/container.adaptors/queue/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/container.adaptors/queue/Android.mk
-
-test_name := containers/container.adaptors/queue/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/containers/container.adaptors/queue/queue.cons.alloc/Android.mk b/test/containers/container.adaptors/queue/queue.cons.alloc/Android.mk
deleted file mode 100644
index 1a8d11a..0000000
--- a/test/containers/container.adaptors/queue/queue.cons.alloc/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/containers/container.adaptors/queue/queue.cons.alloc/Android.mk
-
-test_name := containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc
-test_src := ctor_container_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc
-test_src := ctor_queue_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc
-test_src := ctor_rcontainer_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc
-test_src := ctor_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc
-test_src := ctor_rqueue_alloc.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/containers/container.adaptors/queue/queue.cons/Android.mk b/test/containers/container.adaptors/queue/queue.cons/Android.mk
deleted file mode 100644
index ae3c45b..0000000
--- a/test/containers/container.adaptors/queue/queue.cons/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/containers/container.adaptors/queue/queue.cons/Android.mk
-
-test_name := containers/container.adaptors/queue/queue.cons/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.cons/ctor_copy
-test_src := ctor_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.cons/ctor_container
-test_src := ctor_container.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.cons/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.cons/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.cons/ctor_rcontainer
-test_src := ctor_rcontainer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.cons/ctor_move
-test_src := ctor_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.cons/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.cons/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/containers/container.adaptors/queue/queue.defn/Android.mk b/test/containers/container.adaptors/queue/queue.defn/Android.mk
deleted file mode 100644
index f11791b..0000000
--- a/test/containers/container.adaptors/queue/queue.defn/Android.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# 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/containers/container.adaptors/queue/queue.defn/Android.mk
-
-test_name := containers/container.adaptors/queue/queue.defn/push
-test_src := push.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.defn/front
-test_src := front.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.defn/push_rv
-test_src := push_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.defn/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.defn/front_const
-test_src := front_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.defn/pop
-test_src := pop.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.defn/assign_copy
-test_src := assign_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.defn/back
-test_src := back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.defn/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.defn/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.defn/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.defn/empty
-test_src := empty.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.defn/back_const
-test_src := back_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.defn/assign_move
-test_src := assign_move.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/containers/container.adaptors/queue/queue.ops/Android.mk b/test/containers/container.adaptors/queue/queue.ops/Android.mk
deleted file mode 100644
index 4dc7e63..0000000
--- a/test/containers/container.adaptors/queue/queue.ops/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/containers/container.adaptors/queue/queue.ops/Android.mk
-
-test_name := containers/container.adaptors/queue/queue.ops/lt
-test_src := lt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.ops/eq
-test_src := 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/containers/container.adaptors/queue/queue.special/Android.mk b/test/containers/container.adaptors/queue/queue.special/Android.mk
deleted file mode 100644
index f106c9c..0000000
--- a/test/containers/container.adaptors/queue/queue.special/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/containers/container.adaptors/queue/queue.special/Android.mk
-
-test_name := containers/container.adaptors/queue/queue.special/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/queue/queue.special/swap_noexcept
-test_src := swap_noexcept.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/containers/container.adaptors/stack/Android.mk b/test/containers/container.adaptors/stack/Android.mk
deleted file mode 100644
index 0469f80..0000000
--- a/test/containers/container.adaptors/stack/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/container.adaptors/stack/Android.mk
-
-test_name := containers/container.adaptors/stack/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/containers/container.adaptors/stack/stack.cons.alloc/Android.mk b/test/containers/container.adaptors/stack/stack.cons.alloc/Android.mk
deleted file mode 100644
index 36bcd16..0000000
--- a/test/containers/container.adaptors/stack/stack.cons.alloc/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/containers/container.adaptors/stack/stack.cons.alloc/Android.mk
-
-test_name := containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc
-test_src := ctor_container_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc
-test_src := ctor_rcontainer_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc
-test_src := ctor_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc
-test_src := ctor_copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc
-test_src := ctor_rqueue_alloc.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/containers/container.adaptors/stack/stack.cons/Android.mk b/test/containers/container.adaptors/stack/stack.cons/Android.mk
deleted file mode 100644
index 793d3ed..0000000
--- a/test/containers/container.adaptors/stack/stack.cons/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/containers/container.adaptors/stack/stack.cons/Android.mk
-
-test_name := containers/container.adaptors/stack/stack.cons/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.cons/ctor_copy
-test_src := ctor_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.cons/ctor_container
-test_src := ctor_container.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.cons/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.cons/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.cons/ctor_rcontainer
-test_src := ctor_rcontainer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.cons/ctor_move
-test_src := ctor_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.cons/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.cons/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/containers/container.adaptors/stack/stack.defn/Android.mk b/test/containers/container.adaptors/stack/stack.defn/Android.mk
deleted file mode 100644
index 7e627a9..0000000
--- a/test/containers/container.adaptors/stack/stack.defn/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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/containers/container.adaptors/stack/stack.defn/Android.mk
-
-test_name := containers/container.adaptors/stack/stack.defn/push
-test_src := push.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.defn/top_const
-test_src := top_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.defn/top
-test_src := top.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.defn/push_rv
-test_src := push_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.defn/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.defn/pop
-test_src := pop.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.defn/assign_copy
-test_src := assign_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.defn/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.defn/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.defn/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.defn/empty
-test_src := empty.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.defn/assign_move
-test_src := assign_move.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/containers/container.adaptors/stack/stack.ops/Android.mk b/test/containers/container.adaptors/stack/stack.ops/Android.mk
deleted file mode 100644
index d3c25e6..0000000
--- a/test/containers/container.adaptors/stack/stack.ops/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/containers/container.adaptors/stack/stack.ops/Android.mk
-
-test_name := containers/container.adaptors/stack/stack.ops/lt
-test_src := lt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.ops/eq
-test_src := 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/containers/container.adaptors/stack/stack.special/Android.mk b/test/containers/container.adaptors/stack/stack.special/Android.mk
deleted file mode 100644
index 35baab6..0000000
--- a/test/containers/container.adaptors/stack/stack.special/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/containers/container.adaptors/stack/stack.special/Android.mk
-
-test_name := containers/container.adaptors/stack/stack.special/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/container.adaptors/stack/stack.special/swap_noexcept
-test_src := swap_noexcept.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/containers/container.requirements/Android.mk b/test/containers/container.requirements/Android.mk
deleted file mode 100644
index 73e98a8..0000000
--- a/test/containers/container.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/container.requirements/Android.mk
-
-test_name := containers/container.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/containers/container.requirements/associative.reqmts/Android.mk b/test/containers/container.requirements/associative.reqmts/Android.mk
deleted file mode 100644
index d838cd8..0000000
--- a/test/containers/container.requirements/associative.reqmts/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/container.requirements/associative.reqmts/Android.mk
-
-test_name := containers/container.requirements/associative.reqmts/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/containers/container.requirements/associative.reqmts/associative.reqmts.except/Android.mk b/test/containers/container.requirements/associative.reqmts/associative.reqmts.except/Android.mk
deleted file mode 100644
index 6857976..0000000
--- a/test/containers/container.requirements/associative.reqmts/associative.reqmts.except/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/container.requirements/associative.reqmts/associative.reqmts.except/Android.mk
-
-test_name := containers/container.requirements/associative.reqmts/associative.reqmts.except/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/containers/container.requirements/container.requirements.dataraces/Android.mk b/test/containers/container.requirements/container.requirements.dataraces/Android.mk
deleted file mode 100644
index 86d6d6b..0000000
--- a/test/containers/container.requirements/container.requirements.dataraces/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/container.requirements/container.requirements.dataraces/Android.mk
-
-test_name := containers/container.requirements/container.requirements.dataraces/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/containers/container.requirements/container.requirements.general/Android.mk b/test/containers/container.requirements/container.requirements.general/Android.mk
deleted file mode 100644
index ed5092a..0000000
--- a/test/containers/container.requirements/container.requirements.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/container.requirements/container.requirements.general/Android.mk
-
-test_name := containers/container.requirements/container.requirements.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/containers/container.requirements/sequence.reqmts/Android.mk b/test/containers/container.requirements/sequence.reqmts/Android.mk
deleted file mode 100644
index a5d46fa..0000000
--- a/test/containers/container.requirements/sequence.reqmts/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/container.requirements/sequence.reqmts/Android.mk
-
-test_name := containers/container.requirements/sequence.reqmts/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/containers/container.requirements/unord.req/Android.mk b/test/containers/container.requirements/unord.req/Android.mk
deleted file mode 100644
index 94fca5f..0000000
--- a/test/containers/container.requirements/unord.req/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/container.requirements/unord.req/Android.mk
-
-test_name := containers/container.requirements/unord.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/containers/container.requirements/unord.req/unord.req.except/Android.mk b/test/containers/container.requirements/unord.req/unord.req.except/Android.mk
deleted file mode 100644
index 7d4f954..0000000
--- a/test/containers/container.requirements/unord.req/unord.req.except/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/container.requirements/unord.req/unord.req.except/Android.mk
-
-test_name := containers/container.requirements/unord.req/unord.req.except/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/containers/containers.general/Android.mk b/test/containers/containers.general/Android.mk
deleted file mode 100644
index 1e08581..0000000
--- a/test/containers/containers.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/containers.general/Android.mk
-
-test_name := containers/containers.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/containers/sequences/Android.mk b/test/containers/sequences/Android.mk
deleted file mode 100644
index 91e29bc..0000000
--- a/test/containers/sequences/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/sequences/Android.mk
-
-test_name := containers/sequences/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/containers/sequences/array/Android.mk b/test/containers/sequences/array/Android.mk
deleted file mode 100644
index 6fd1aa9..0000000
--- a/test/containers/sequences/array/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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/containers/sequences/array/Android.mk
-
-test_name := containers/sequences/array/begin
-test_src := begin.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/array/at
-test_src := at.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/array/front_back
-test_src := front_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/array/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/array/iterators
-test_src := iterators.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/array/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/array/indexing
-test_src := indexing.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/containers/sequences/array/array.cons/Android.mk b/test/containers/sequences/array/array.cons/Android.mk
deleted file mode 100644
index 4b77e7e..0000000
--- a/test/containers/sequences/array/array.cons/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/containers/sequences/array/array.cons/Android.mk
-
-test_name := containers/sequences/array/array.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/array/array.cons/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
diff --git a/test/containers/sequences/array/array.data/Android.mk b/test/containers/sequences/array/array.data/Android.mk
deleted file mode 100644
index a20979e..0000000
--- a/test/containers/sequences/array/array.data/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/containers/sequences/array/array.data/Android.mk
-
-test_name := containers/sequences/array/array.data/data_const
-test_src := data_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/array/array.data/data
-test_src := data.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/containers/sequences/array/array.fill/Android.mk b/test/containers/sequences/array/array.fill/Android.mk
deleted file mode 100644
index b2a0ad4..0000000
--- a/test/containers/sequences/array/array.fill/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/sequences/array/array.fill/Android.mk
-
-test_name := containers/sequences/array/array.fill/fill
-test_src := fill.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/containers/sequences/array/array.size/Android.mk b/test/containers/sequences/array/array.size/Android.mk
deleted file mode 100644
index 51ee300..0000000
--- a/test/containers/sequences/array/array.size/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/sequences/array/array.size/Android.mk
-
-test_name := containers/sequences/array/array.size/size
-test_src := 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/containers/sequences/array/array.special/Android.mk b/test/containers/sequences/array/array.special/Android.mk
deleted file mode 100644
index 8990924..0000000
--- a/test/containers/sequences/array/array.special/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/sequences/array/array.special/Android.mk
-
-test_name := containers/sequences/array/array.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/containers/sequences/array/array.swap/Android.mk b/test/containers/sequences/array/array.swap/Android.mk
deleted file mode 100644
index 046386c..0000000
--- a/test/containers/sequences/array/array.swap/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/sequences/array/array.swap/Android.mk
-
-test_name := containers/sequences/array/array.swap/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/containers/sequences/array/array.tuple/Android.mk b/test/containers/sequences/array/array.tuple/Android.mk
deleted file mode 100644
index f85d097..0000000
--- a/test/containers/sequences/array/array.tuple/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/containers/sequences/array/array.tuple/Android.mk
-
-test_name := containers/sequences/array/array.tuple/get
-test_src := get.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/array/array.tuple/tuple_element
-test_src := tuple_element.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/array/array.tuple/tuple_size
-test_src := tuple_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/array/array.tuple/get_const
-test_src := get_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/array/array.tuple/get_rv
-test_src := get_rv.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/containers/sequences/array/array.zero/Android.mk b/test/containers/sequences/array/array.zero/Android.mk
deleted file mode 100644
index 51cf52b..0000000
--- a/test/containers/sequences/array/array.zero/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/sequences/array/array.zero/Android.mk
-
-test_name := containers/sequences/array/array.zero/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/containers/sequences/deque/Android.mk b/test/containers/sequences/deque/Android.mk
deleted file mode 100644
index 9d91945..0000000
--- a/test/containers/sequences/deque/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/containers/sequences/deque/Android.mk
-
-test_name := containers/sequences/deque/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/iterators
-test_src := iterators.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/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/containers/sequences/deque/deque.capacity/Android.mk b/test/containers/sequences/deque/deque.capacity/Android.mk
deleted file mode 100644
index 97d0c62..0000000
--- a/test/containers/sequences/deque/deque.capacity/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/containers/sequences/deque/deque.capacity/Android.mk
-
-test_name := containers/sequences/deque/deque.capacity/access
-test_src := access.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.capacity/shrink_to_fit
-test_src := shrink_to_fit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.capacity/resize_size_value
-test_src := resize_size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.capacity/resize_size
-test_src := resize_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/containers/sequences/deque/deque.cons/Android.mk b/test/containers/sequences/deque/deque.cons/Android.mk
deleted file mode 100644
index d7beac4..0000000
--- a/test/containers/sequences/deque/deque.cons/Android.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# 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/containers/sequences/deque/deque.cons/Android.mk
-
-test_name := containers/sequences/deque/deque.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/assign_size_value
-test_src := assign_size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/alloc
-test_src := alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/iter_iter
-test_src := iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/initializer_list_alloc
-test_src := initializer_list_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/op_equal
-test_src := op_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/size_value
-test_src := size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/assign_initializer_list
-test_src := assign_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/copy_alloc
-test_src := copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/iter_iter_alloc
-test_src := iter_iter_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/move_assign
-test_src := move_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/assign_iter_iter
-test_src := assign_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/initializer_list
-test_src := initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/op_equal_initializer_list
-test_src := op_equal_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/size_value_alloc
-test_src := size_value_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.cons/move_alloc
-test_src := move_alloc.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/containers/sequences/deque/deque.modifiers/Android.mk b/test/containers/sequences/deque/deque.modifiers/Android.mk
deleted file mode 100644
index eebe12c..0000000
--- a/test/containers/sequences/deque/deque.modifiers/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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/containers/sequences/deque/deque.modifiers/Android.mk
-
-test_name := containers/sequences/deque/deque.modifiers/push_front_rvalue
-test_src := push_front_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/push_back_exception_safety
-test_src := push_back_exception_safety.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/pop_back
-test_src := pop_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/emplace_back
-test_src := emplace_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/insert_iter_iter
-test_src := insert_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/insert_iter_initializer_list
-test_src := insert_iter_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/insert_size_value
-test_src := insert_size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/push_front_exception_safety
-test_src := push_front_exception_safety.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/insert_value
-test_src := insert_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/insert_rvalue
-test_src := insert_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/push_back
-test_src := push_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/erase_iter
-test_src := erase_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/erase_iter_iter
-test_src := erase_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/push_back_rvalue
-test_src := push_back_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/emplace_front
-test_src := emplace_front.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/pop_front
-test_src := pop_front.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.modifiers/push_front
-test_src := push_front.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/containers/sequences/deque/deque.special/Android.mk b/test/containers/sequences/deque/deque.special/Android.mk
deleted file mode 100644
index 6abcc0a..0000000
--- a/test/containers/sequences/deque/deque.special/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/containers/sequences/deque/deque.special/Android.mk
-
-test_name := containers/sequences/deque/deque.special/copy_backward
-test_src := copy_backward.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.special/move_backward
-test_src := move_backward.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.special/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.special/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.special/swap_noexcept
-test_src := swap_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/deque/deque.special/move
-test_src := move.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/containers/sequences/dynarray/Android.mk b/test/containers/sequences/dynarray/Android.mk
deleted file mode 100644
index e5812e7..0000000
--- a/test/containers/sequences/dynarray/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/sequences/dynarray/Android.mk
-
-test_name := containers/sequences/dynarray/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/containers/sequences/dynarray/dynarray.cons/Android.mk b/test/containers/sequences/dynarray/dynarray.cons/Android.mk
deleted file mode 100644
index 0e065ac..0000000
--- a/test/containers/sequences/dynarray/dynarray.cons/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/containers/sequences/dynarray/dynarray.cons/Android.mk
-
-test_name := containers/sequences/dynarray/dynarray.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/dynarray/dynarray.cons/alloc
-test_src := alloc.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/containers/sequences/dynarray/dynarray.data/Android.mk b/test/containers/sequences/dynarray/dynarray.data/Android.mk
deleted file mode 100644
index 95c695e..0000000
--- a/test/containers/sequences/dynarray/dynarray.data/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/sequences/dynarray/dynarray.data/Android.mk
-
-test_name := containers/sequences/dynarray/dynarray.data/default
-test_src := 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/containers/sequences/dynarray/dynarray.mutate/Android.mk b/test/containers/sequences/dynarray/dynarray.mutate/Android.mk
deleted file mode 100644
index 3b57be6..0000000
--- a/test/containers/sequences/dynarray/dynarray.mutate/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/sequences/dynarray/dynarray.mutate/Android.mk
-
-test_name := containers/sequences/dynarray/dynarray.mutate/default
-test_src := 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/containers/sequences/dynarray/dynarray.overview/Android.mk b/test/containers/sequences/dynarray/dynarray.overview/Android.mk
deleted file mode 100644
index b859fe0..0000000
--- a/test/containers/sequences/dynarray/dynarray.overview/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/containers/sequences/dynarray/dynarray.overview/Android.mk
-
-test_name := containers/sequences/dynarray/dynarray.overview/at
-test_src := at.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/dynarray/dynarray.overview/front_back
-test_src := front_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/dynarray/dynarray.overview/capacity
-test_src := capacity.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/dynarray/dynarray.overview/indexing
-test_src := indexing.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/dynarray/dynarray.overview/begin_end
-test_src := begin_end.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/containers/sequences/dynarray/dynarray.traits/Android.mk b/test/containers/sequences/dynarray/dynarray.traits/Android.mk
deleted file mode 100644
index 0bbab88..0000000
--- a/test/containers/sequences/dynarray/dynarray.traits/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/sequences/dynarray/dynarray.traits/Android.mk
-
-test_name := containers/sequences/dynarray/dynarray.traits/default
-test_src := 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/containers/sequences/dynarray/dynarray.zero/Android.mk b/test/containers/sequences/dynarray/dynarray.zero/Android.mk
deleted file mode 100644
index fbe8bda..0000000
--- a/test/containers/sequences/dynarray/dynarray.zero/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/sequences/dynarray/dynarray.zero/Android.mk
-
-test_name := containers/sequences/dynarray/dynarray.zero/default
-test_src := 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/containers/sequences/forwardlist/Android.mk b/test/containers/sequences/forwardlist/Android.mk
deleted file mode 100644
index 6faadf9..0000000
--- a/test/containers/sequences/forwardlist/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/containers/sequences/forwardlist/Android.mk
-
-test_name := containers/sequences/forwardlist/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/max_size
-test_src := max_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/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/containers/sequences/forwardlist/forwardlist.access/Android.mk b/test/containers/sequences/forwardlist/forwardlist.access/Android.mk
deleted file mode 100644
index 1e9e4cf..0000000
--- a/test/containers/sequences/forwardlist/forwardlist.access/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/sequences/forwardlist/forwardlist.access/Android.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.access/front
-test_src := front.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/containers/sequences/forwardlist/forwardlist.cons/Android.mk b/test/containers/sequences/forwardlist/forwardlist.cons/Android.mk
deleted file mode 100644
index f776ad3..0000000
--- a/test/containers/sequences/forwardlist/forwardlist.cons/Android.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# 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/containers/sequences/forwardlist/forwardlist.cons/Android.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/assign_size_value
-test_src := assign_size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/alloc
-test_src := alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/assign_op_init
-test_src := assign_op_init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/size_value
-test_src := size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/init
-test_src := init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/assign_copy
-test_src := assign_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/assign_range
-test_src := assign_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/copy_alloc
-test_src := copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/range_alloc
-test_src := range_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/default_recursive
-test_src := default_recursive.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/range
-test_src := range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/size_value_alloc
-test_src := size_value_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/assign_move
-test_src := assign_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/assign_init
-test_src := assign_init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/init_alloc
-test_src := init_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.cons/move_alloc
-test_src := move_alloc.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/containers/sequences/forwardlist/forwardlist.iter/Android.mk b/test/containers/sequences/forwardlist/forwardlist.iter/Android.mk
deleted file mode 100644
index 195bf0a..0000000
--- a/test/containers/sequences/forwardlist/forwardlist.iter/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/containers/sequences/forwardlist/forwardlist.iter/Android.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.iter/before_begin
-test_src := before_begin.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.iter/iterators
-test_src := iterators.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/containers/sequences/forwardlist/forwardlist.modifiers/Android.mk b/test/containers/sequences/forwardlist/forwardlist.modifiers/Android.mk
deleted file mode 100644
index b1b4e10..0000000
--- a/test/containers/sequences/forwardlist/forwardlist.modifiers/Android.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# 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/containers/sequences/forwardlist/forwardlist.modifiers/Android.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range
-test_src := insert_after_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv
-test_src := insert_after_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value
-test_src := insert_after_size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv
-test_src := push_front_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/emplace_after
-test_src := emplace_after.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one
-test_src := erase_after_one.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init
-test_src := insert_after_init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value
-test_src := resize_size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const
-test_src := insert_after_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/push_front_exception_safety
-test_src := push_front_exception_safety.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many
-test_src := erase_after_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/push_front_const
-test_src := push_front_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/emplace_front
-test_src := emplace_front.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/pop_front
-test_src := pop_front.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.modifiers/resize_size
-test_src := resize_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/containers/sequences/forwardlist/forwardlist.ops/Android.mk b/test/containers/sequences/forwardlist/forwardlist.ops/Android.mk
deleted file mode 100644
index 482418e..0000000
--- a/test/containers/sequences/forwardlist/forwardlist.ops/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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/containers/sequences/forwardlist/forwardlist.ops/Android.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.ops/sort
-test_src := sort.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.ops/merge_pred
-test_src := merge_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.ops/merge
-test_src := merge.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.ops/unique_pred
-test_src := unique_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.ops/splice_after_flist
-test_src := splice_after_flist.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.ops/sort_pred
-test_src := sort_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.ops/splice_after_one
-test_src := splice_after_one.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.ops/reverse
-test_src := reverse.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.ops/unique
-test_src := unique.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.ops/remove
-test_src := remove.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.ops/remove_if
-test_src := remove_if.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.ops/splice_after_range
-test_src := splice_after_range.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/containers/sequences/forwardlist/forwardlist.spec/Android.mk b/test/containers/sequences/forwardlist/forwardlist.spec/Android.mk
deleted file mode 100644
index d4c98b3..0000000
--- a/test/containers/sequences/forwardlist/forwardlist.spec/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/containers/sequences/forwardlist/forwardlist.spec/Android.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.spec/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.spec/swap_noexcept
-test_src := swap_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.spec/equal
-test_src := equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.spec/relational
-test_src := relational.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/forwardlist/forwardlist.spec/non_member_swap
-test_src := non_member_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/containers/sequences/list/Android.mk b/test/containers/sequences/list/Android.mk
deleted file mode 100644
index 5245d34..0000000
--- a/test/containers/sequences/list/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# 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/containers/sequences/list/Android.mk
-
-test_name := containers/sequences/list/db_iterators_7
-test_src := db_iterators_7.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/db_front
-test_src := db_front.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/db_cback
-test_src := db_cback.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/iterators
-test_src := iterators.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/db_iterators_9
-test_src := db_iterators_9.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/db_iterators_8
-test_src := db_iterators_8.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/db_back
-test_src := db_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/db_cfront
-test_src := db_cfront.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/db_iterators_6
-test_src := db_iterators_6.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/containers/sequences/list/list.capacity/Android.mk b/test/containers/sequences/list/list.capacity/Android.mk
deleted file mode 100644
index e40c626..0000000
--- a/test/containers/sequences/list/list.capacity/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/containers/sequences/list/list.capacity/Android.mk
-
-test_name := containers/sequences/list/list.capacity/resize_size_value
-test_src := resize_size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.capacity/resize_size
-test_src := resize_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/containers/sequences/list/list.cons/Android.mk b/test/containers/sequences/list/list.cons/Android.mk
deleted file mode 100644
index 7564815..0000000
--- a/test/containers/sequences/list/list.cons/Android.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# 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/containers/sequences/list/list.cons/Android.mk
-
-test_name := containers/sequences/list/list.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/size_type
-test_src := size_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/initializer_list_alloc
-test_src := initializer_list_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/assign_copy
-test_src := assign_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/assign_initializer_list
-test_src := assign_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/copy_alloc
-test_src := copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/initializer_list
-test_src := initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/default_stack_alloc
-test_src := default_stack_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/op_equal_initializer_list
-test_src := op_equal_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/size_value_alloc
-test_src := size_value_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/assign_move
-test_src := assign_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/input_iterator
-test_src := input_iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.cons/move_alloc
-test_src := move_alloc.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/containers/sequences/list/list.modifiers/Android.mk b/test/containers/sequences/list/list.modifiers/Android.mk
deleted file mode 100644
index cc8447a..0000000
--- a/test/containers/sequences/list/list.modifiers/Android.mk
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# 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/containers/sequences/list/list.modifiers/Android.mk
-
-test_name := containers/sequences/list/list.modifiers/push_front_rvalue
-test_src := push_front_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/erase_iter_iter_db4
-test_src := erase_iter_iter_db4.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/push_back_exception_safety
-test_src := push_back_exception_safety.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/insert_iter_iter_iter
-test_src := insert_iter_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/pop_back
-test_src := pop_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/erase_iter_iter_db1
-test_src := erase_iter_iter_db1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/emplace_back
-test_src := emplace_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/insert_iter_initializer_list
-test_src := insert_iter_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/erase_iter_iter_db3
-test_src := erase_iter_iter_db3.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/erase_iter_db2
-test_src := erase_iter_db2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/insert_iter_value
-test_src := insert_iter_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/push_front_exception_safety
-test_src := push_front_exception_safety.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/insert_iter_size_value
-test_src := insert_iter_size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/insert_iter_rvalue
-test_src := insert_iter_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/push_back
-test_src := push_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/erase_iter
-test_src := erase_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/erase_iter_db1
-test_src := erase_iter_db1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/erase_iter_iter
-test_src := erase_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/push_back_rvalue
-test_src := push_back_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/emplace_front
-test_src := emplace_front.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/erase_iter_iter_db2
-test_src := erase_iter_iter_db2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/pop_front
-test_src := pop_front.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.modifiers/push_front
-test_src := push_front.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/containers/sequences/list/list.ops/Android.mk b/test/containers/sequences/list/list.ops/Android.mk
deleted file mode 100644
index afa04fd..0000000
--- a/test/containers/sequences/list/list.ops/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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/containers/sequences/list/list.ops/Android.mk
-
-test_name := containers/sequences/list/list.ops/sort
-test_src := sort.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.ops/sort_comp
-test_src := sort_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.ops/merge
-test_src := merge.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.ops/unique_pred
-test_src := unique_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.ops/splice_pos_list_iter
-test_src := splice_pos_list_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.ops/splice_pos_list
-test_src := splice_pos_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.ops/merge_comp
-test_src := merge_comp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.ops/splice_pos_list_iter_iter
-test_src := splice_pos_list_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.ops/reverse
-test_src := reverse.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.ops/unique
-test_src := unique.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.ops/remove
-test_src := remove.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.ops/remove_if
-test_src := remove_if.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/containers/sequences/list/list.special/Android.mk b/test/containers/sequences/list/list.special/Android.mk
deleted file mode 100644
index 76873bf..0000000
--- a/test/containers/sequences/list/list.special/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/containers/sequences/list/list.special/Android.mk
-
-test_name := containers/sequences/list/list.special/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.special/swap_noexcept
-test_src := swap_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/list/list.special/db_swap_1
-test_src := db_swap_1.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/containers/sequences/vector.bool/Android.mk b/test/containers/sequences/vector.bool/Android.mk
deleted file mode 100644
index 744752c..0000000
--- a/test/containers/sequences/vector.bool/Android.mk
+++ /dev/null
@@ -1,179 +0,0 @@
-#
-# 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/containers/sequences/vector.bool/Android.mk
-
-test_name := containers/sequences/vector.bool/construct_default
-test_src := construct_default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/vector_bool
-test_src := vector_bool.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/construct_size
-test_src := construct_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/insert_iter_iter_iter
-test_src := insert_iter_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/find
-test_src := find.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/initializer_list_alloc
-test_src := initializer_list_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/construct_size_value
-test_src := construct_size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/emplace_back
-test_src := emplace_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/shrink_to_fit
-test_src := shrink_to_fit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/insert_iter_initializer_list
-test_src := insert_iter_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/swap_noexcept
-test_src := swap_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/assign_copy
-test_src := assign_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/insert_iter_value
-test_src := insert_iter_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/construct_iter_iter
-test_src := construct_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/assign_initializer_list
-test_src := assign_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/resize_size_value
-test_src := resize_size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/copy_alloc
-test_src := copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/capacity
-test_src := capacity.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/construct_iter_iter_alloc
-test_src := construct_iter_iter_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/iterators
-test_src := iterators.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/construct_size_value_alloc
-test_src := construct_size_value_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/reserve
-test_src := reserve.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/insert_iter_size_value
-test_src := insert_iter_size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/push_back
-test_src := push_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/erase_iter
-test_src := erase_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/erase_iter_iter
-test_src := erase_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/initializer_list
-test_src := initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/op_equal_initializer_list
-test_src := op_equal_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/assign_move
-test_src := assign_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/resize_size
-test_src := resize_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector.bool/move_alloc
-test_src := move_alloc.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/containers/sequences/vector/Android.mk b/test/containers/sequences/vector/Android.mk
deleted file mode 100644
index 391d7e9..0000000
--- a/test/containers/sequences/vector/Android.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# 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/containers/sequences/vector/Android.mk
-
-test_name := containers/sequences/vector/db_iterators_7
-test_src := db_iterators_7.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/db_front
-test_src := db_front.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/db_iterators_5
-test_src := db_iterators_5.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/db_cback
-test_src := db_cback.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/db_iterators_3
-test_src := db_iterators_3.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/iterators
-test_src := iterators.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/db_iterators_2
-test_src := db_iterators_2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/db_cindex
-test_src := db_cindex.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/const_value_type
-test_src := const_value_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/db_iterators_8
-test_src := db_iterators_8.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/db_back
-test_src := db_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/db_cfront
-test_src := db_cfront.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/db_iterators_4
-test_src := db_iterators_4.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/db_index
-test_src := db_index.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/db_iterators_6
-test_src := db_iterators_6.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/containers/sequences/vector/vector.capacity/Android.mk b/test/containers/sequences/vector/vector.capacity/Android.mk
deleted file mode 100644
index dfb8434..0000000
--- a/test/containers/sequences/vector/vector.capacity/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/containers/sequences/vector/vector.capacity/Android.mk
-
-test_name := containers/sequences/vector/vector.capacity/shrink_to_fit
-test_src := shrink_to_fit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.capacity/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.capacity/resize_size_value
-test_src := resize_size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.capacity/capacity
-test_src := capacity.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.capacity/reserve
-test_src := reserve.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.capacity/resize_size
-test_src := resize_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/containers/sequences/vector/vector.cons/Android.mk b/test/containers/sequences/vector/vector.cons/Android.mk
deleted file mode 100644
index 2bf1c1f..0000000
--- a/test/containers/sequences/vector/vector.cons/Android.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# 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/containers/sequences/vector/vector.cons/Android.mk
-
-test_name := containers/sequences/vector/vector.cons/construct_default
-test_src := construct_default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/construct_size
-test_src := construct_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/initializer_list_alloc
-test_src := initializer_list_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/construct_size_value
-test_src := construct_size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/assign_copy
-test_src := assign_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/construct_iter_iter
-test_src := construct_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/assign_initializer_list
-test_src := assign_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/copy_alloc
-test_src := copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/default.recursive
-test_src := default.recursive.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/construct_iter_iter_alloc
-test_src := construct_iter_iter_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/construct_size_value_alloc
-test_src := construct_size_value_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/initializer_list
-test_src := initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/op_equal_initializer_list
-test_src := op_equal_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/assign_move
-test_src := assign_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.cons/move_alloc
-test_src := move_alloc.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/containers/sequences/vector/vector.data/Android.mk b/test/containers/sequences/vector/vector.data/Android.mk
deleted file mode 100644
index a81e6e1..0000000
--- a/test/containers/sequences/vector/vector.data/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/containers/sequences/vector/vector.data/Android.mk
-
-test_name := containers/sequences/vector/vector.data/data_const
-test_src := data_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.data/data
-test_src := data.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/containers/sequences/vector/vector.modifiers/Android.mk b/test/containers/sequences/vector/vector.modifiers/Android.mk
deleted file mode 100644
index 1c95fd4..0000000
--- a/test/containers/sequences/vector/vector.modifiers/Android.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# 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/containers/sequences/vector/vector.modifiers/Android.mk
-
-test_name := containers/sequences/vector/vector.modifiers/erase_iter_iter_db4
-test_src := erase_iter_iter_db4.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/push_back_exception_safety
-test_src := push_back_exception_safety.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/insert_iter_iter_iter
-test_src := insert_iter_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/pop_back
-test_src := pop_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/erase_iter_iter_db1
-test_src := erase_iter_iter_db1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/emplace_back
-test_src := emplace_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/insert_iter_initializer_list
-test_src := insert_iter_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/erase_iter_iter_db3
-test_src := erase_iter_iter_db3.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/erase_iter_db2
-test_src := erase_iter_db2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/insert_iter_value
-test_src := insert_iter_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/emplace_extra
-test_src := emplace_extra.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/insert_iter_size_value
-test_src := insert_iter_size_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/insert_iter_rvalue
-test_src := insert_iter_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/push_back
-test_src := push_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/erase_iter
-test_src := erase_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/erase_iter_db1
-test_src := erase_iter_db1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/erase_iter_iter
-test_src := erase_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/push_back_rvalue
-test_src := push_back_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.modifiers/erase_iter_iter_db2
-test_src := erase_iter_iter_db2.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/containers/sequences/vector/vector.special/Android.mk b/test/containers/sequences/vector/vector.special/Android.mk
deleted file mode 100644
index 28958dc..0000000
--- a/test/containers/sequences/vector/vector.special/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/containers/sequences/vector/vector.special/Android.mk
-
-test_name := containers/sequences/vector/vector.special/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.special/swap_noexcept
-test_src := swap_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/sequences/vector/vector.special/db_swap_1
-test_src := db_swap_1.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/containers/unord/Android.mk b/test/containers/unord/Android.mk
deleted file mode 100644
index 443dc34..0000000
--- a/test/containers/unord/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/containers/unord/Android.mk
-
-test_name := containers/unord/next_prime
-test_src := next_prime.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/containers/unord/unord.map/Android.mk b/test/containers/unord/unord.map/Android.mk
deleted file mode 100644
index b779de5..0000000
--- a/test/containers/unord/unord.map/Android.mk
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# 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/containers/unord/unord.map/Android.mk
-
-test_name := containers/unord/unord.map/db_iterators_7
-test_src := db_iterators_7.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/compare
-test_src := compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/swap_member
-test_src := swap_member.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/bucket_size
-test_src := bucket_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/bucket_count
-test_src := bucket_count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/max_load_factor
-test_src := max_load_factor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/db_local_iterators_7
-test_src := db_local_iterators_7.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/find_const
-test_src := find_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/max_bucket_count
-test_src := max_bucket_count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/local_iterators
-test_src := local_iterators.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/equal_range_const
-test_src := equal_range_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/max_size
-test_src := max_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/find_non_const
-test_src := find_non_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/iterators
-test_src := iterators.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/reserve
-test_src := reserve.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/bucket
-test_src := bucket.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/load_factor
-test_src := load_factor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/count
-test_src := count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/db_iterators_8
-test_src := db_iterators_8.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/db_local_iterators_8
-test_src := db_local_iterators_8.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/eq
-test_src := eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/rehash
-test_src := rehash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/equal_range_non_const
-test_src := equal_range_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/containers/unord/unord.map/unord.map.cnstr/Android.mk b/test/containers/unord/unord.map/unord.map.cnstr/Android.mk
deleted file mode 100644
index 33966c3..0000000
--- a/test/containers/unord/unord.map/unord.map.cnstr/Android.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# 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/containers/unord/unord.map/unord.map.cnstr/Android.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/size_hash
-test_src := size_hash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator
-test_src := range_size_hash_equal_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/init_size
-test_src := init_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/size_hash_equal
-test_src := size_hash_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/range_size_hash
-test_src := range_size_hash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal
-test_src := init_size_hash_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/init
-test_src := init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/assign_copy
-test_src := assign_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator
-test_src := init_size_hash_equal_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/copy_alloc
-test_src := copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/init_size_hash
-test_src := init_size_hash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/range_size
-test_src := range_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/allocator
-test_src := allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/range
-test_src := range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator
-test_src := size_hash_equal_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/assign_move
-test_src := assign_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/assign_init
-test_src := assign_init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal
-test_src := range_size_hash_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.cnstr/move_alloc
-test_src := move_alloc.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/containers/unord/unord.map/unord.map.elem/Android.mk b/test/containers/unord/unord.map/unord.map.elem/Android.mk
deleted file mode 100644
index 4e305e6..0000000
--- a/test/containers/unord/unord.map/unord.map.elem/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/containers/unord/unord.map/unord.map.elem/Android.mk
-
-test_name := containers/unord/unord.map/unord.map.elem/at
-test_src := at.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.elem/index_tuple
-test_src := index_tuple.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.elem/index
-test_src := index.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/containers/unord/unord.map/unord.map.swap/Android.mk b/test/containers/unord/unord.map/unord.map.swap/Android.mk
deleted file mode 100644
index 1a0e94d..0000000
--- a/test/containers/unord/unord.map/unord.map.swap/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/containers/unord/unord.map/unord.map.swap/Android.mk
-
-test_name := containers/unord/unord.map/unord.map.swap/swap_non_member
-test_src := swap_non_member.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.swap/swap_noexcept
-test_src := swap_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unord.map.swap/db_swap_1
-test_src := db_swap_1.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/containers/unord/unord.map/unorder.map.modifiers/Android.mk b/test/containers/unord/unord.map/unorder.map.modifiers/Android.mk
deleted file mode 100644
index 29ab560..0000000
--- a/test/containers/unord/unord.map/unorder.map.modifiers/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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/containers/unord/unord.map/unorder.map.modifiers/Android.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db4
-test_src := erase_iter_iter_db4.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/emplace_hint
-test_src := emplace_hint.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db1
-test_src := erase_iter_iter_db1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue
-test_src := insert_hint_const_lvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/erase_range
-test_src := erase_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db3
-test_src := erase_iter_iter_db3.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/erase_key
-test_src := erase_key.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/erase_iter_db2
-test_src := erase_iter_db2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/insert_init
-test_src := insert_init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/erase_const_iter
-test_src := erase_const_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/insert_range
-test_src := insert_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/insert_rvalue
-test_src := insert_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue
-test_src := insert_hint_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/erase_iter_db1
-test_src := erase_iter_db1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/erase_iter_iter_db2
-test_src := erase_iter_iter_db2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.map/unorder.map.modifiers/insert_const_lvalue
-test_src := insert_const_lvalue.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/containers/unord/unord.multimap/Android.mk b/test/containers/unord/unord.multimap/Android.mk
deleted file mode 100644
index df608cd..0000000
--- a/test/containers/unord/unord.multimap/Android.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# 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/containers/unord/unord.multimap/Android.mk
-
-test_name := containers/unord/unord.multimap/db_iterators_7
-test_src := db_iterators_7.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/swap_member
-test_src := swap_member.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/bucket_size
-test_src := bucket_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/bucket_count
-test_src := bucket_count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/max_load_factor
-test_src := max_load_factor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/db_local_iterators_7
-test_src := db_local_iterators_7.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/find_const
-test_src := find_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/max_bucket_count
-test_src := max_bucket_count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/local_iterators
-test_src := local_iterators.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/equal_range_const
-test_src := equal_range_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/max_size
-test_src := max_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/find_non_const
-test_src := find_non_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/iterators
-test_src := iterators.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/scary
-test_src := scary.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/reserve
-test_src := reserve.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/bucket
-test_src := bucket.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/load_factor
-test_src := load_factor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/count
-test_src := count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/db_iterators_8
-test_src := db_iterators_8.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/db_local_iterators_8
-test_src := db_local_iterators_8.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/eq
-test_src := eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/rehash
-test_src := rehash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/equal_range_non_const
-test_src := equal_range_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/containers/unord/unord.multimap/unord.multimap.cnstr/Android.mk b/test/containers/unord/unord.multimap/unord.multimap.cnstr/Android.mk
deleted file mode 100644
index 1306220..0000000
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/Android.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# 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/containers/unord/unord.multimap/unord.multimap.cnstr/Android.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/size_hash
-test_src := size_hash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator
-test_src := range_size_hash_equal_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/init_size
-test_src := init_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal
-test_src := size_hash_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash
-test_src := range_size_hash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal
-test_src := init_size_hash_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/init
-test_src := init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy
-test_src := assign_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator
-test_src := init_size_hash_equal_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc
-test_src := copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash
-test_src := init_size_hash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/range_size
-test_src := range_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/allocator
-test_src := allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/range
-test_src := range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator
-test_src := size_hash_equal_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/assign_move
-test_src := assign_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/assign_init
-test_src := assign_init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal
-test_src := range_size_hash_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc
-test_src := move_alloc.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/containers/unord/unord.multimap/unord.multimap.modifiers/Android.mk b/test/containers/unord/unord.multimap/unord.multimap.modifiers/Android.mk
deleted file mode 100644
index 295c373..0000000
--- a/test/containers/unord/unord.multimap/unord.multimap.modifiers/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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/containers/unord/unord.multimap/unord.multimap.modifiers/Android.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db4
-test_src := erase_iter_iter_db4.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint
-test_src := emplace_hint.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db1
-test_src := erase_iter_iter_db1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue
-test_src := insert_hint_const_lvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/erase_range
-test_src := erase_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db3
-test_src := erase_iter_iter_db3.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/erase_key
-test_src := erase_key.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db2
-test_src := erase_iter_db2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/insert_init
-test_src := insert_init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter
-test_src := erase_const_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/insert_range
-test_src := insert_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue
-test_src := insert_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue
-test_src := insert_hint_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db1
-test_src := erase_iter_db1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db2
-test_src := erase_iter_iter_db2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue
-test_src := insert_const_lvalue.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/containers/unord/unord.multimap/unord.multimap.swap/Android.mk b/test/containers/unord/unord.multimap/unord.multimap.swap/Android.mk
deleted file mode 100644
index 7bb6fdd..0000000
--- a/test/containers/unord/unord.multimap/unord.multimap.swap/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/containers/unord/unord.multimap/unord.multimap.swap/Android.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.swap/swap_non_member
-test_src := swap_non_member.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept
-test_src := swap_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multimap/unord.multimap.swap/db_swap_1
-test_src := db_swap_1.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/containers/unord/unord.multiset/Android.mk b/test/containers/unord/unord.multiset/Android.mk
deleted file mode 100644
index 32a0a7c..0000000
--- a/test/containers/unord/unord.multiset/Android.mk
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-# 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/containers/unord/unord.multiset/Android.mk
-
-test_name := containers/unord/unord.multiset/db_iterators_7
-test_src := db_iterators_7.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/swap_member
-test_src := swap_member.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/erase_iter_iter_db4
-test_src := erase_iter_iter_db4.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/bucket_size
-test_src := bucket_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/bucket_count
-test_src := bucket_count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/max_load_factor
-test_src := max_load_factor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/emplace_hint
-test_src := emplace_hint.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/erase_iter_iter_db1
-test_src := erase_iter_iter_db1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/db_local_iterators_7
-test_src := db_local_iterators_7.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/insert_hint_const_lvalue
-test_src := insert_hint_const_lvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/erase_range
-test_src := erase_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/find_const
-test_src := find_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/max_bucket_count
-test_src := max_bucket_count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/erase_iter_iter_db3
-test_src := erase_iter_iter_db3.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/erase_key
-test_src := erase_key.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/erase_iter_db2
-test_src := erase_iter_db2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/insert_init
-test_src := insert_init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/erase_const_iter
-test_src := erase_const_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/local_iterators
-test_src := local_iterators.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/equal_range_const
-test_src := equal_range_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/insert_range
-test_src := insert_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/max_size
-test_src := max_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/find_non_const
-test_src := find_non_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/iterators
-test_src := iterators.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/scary
-test_src := scary.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/reserve
-test_src := reserve.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/bucket
-test_src := bucket.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/insert_rvalue
-test_src := insert_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/insert_hint_rvalue
-test_src := insert_hint_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/erase_iter_db1
-test_src := erase_iter_db1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/load_factor
-test_src := load_factor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/count
-test_src := count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/db_iterators_8
-test_src := db_iterators_8.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/db_local_iterators_8
-test_src := db_local_iterators_8.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/erase_iter_iter_db2
-test_src := erase_iter_iter_db2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/eq
-test_src := eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/insert_const_lvalue
-test_src := insert_const_lvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/rehash
-test_src := rehash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/equal_range_non_const
-test_src := equal_range_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/containers/unord/unord.multiset/unord.multiset.cnstr/Android.mk b/test/containers/unord/unord.multiset/unord.multiset.cnstr/Android.mk
deleted file mode 100644
index dca4388..0000000
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/Android.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# 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/containers/unord/unord.multiset/unord.multiset.cnstr/Android.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/size_hash
-test_src := size_hash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator
-test_src := range_size_hash_equal_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/init_size
-test_src := init_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal
-test_src := size_hash_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash
-test_src := range_size_hash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal
-test_src := init_size_hash_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/init
-test_src := init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy
-test_src := assign_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator
-test_src := init_size_hash_equal_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc
-test_src := copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash
-test_src := init_size_hash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/range_size
-test_src := range_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/allocator
-test_src := allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/range
-test_src := range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator
-test_src := size_hash_equal_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/assign_move
-test_src := assign_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/assign_init
-test_src := assign_init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal
-test_src := range_size_hash_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc
-test_src := move_alloc.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/containers/unord/unord.multiset/unord.multiset.swap/Android.mk b/test/containers/unord/unord.multiset/unord.multiset.swap/Android.mk
deleted file mode 100644
index 595d084..0000000
--- a/test/containers/unord/unord.multiset/unord.multiset.swap/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/containers/unord/unord.multiset/unord.multiset.swap/Android.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.swap/swap_non_member
-test_src := swap_non_member.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept
-test_src := swap_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.multiset/unord.multiset.swap/db_swap_1
-test_src := db_swap_1.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/containers/unord/unord.set/Android.mk b/test/containers/unord/unord.set/Android.mk
deleted file mode 100644
index 7a82d11..0000000
--- a/test/containers/unord/unord.set/Android.mk
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-# 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/containers/unord/unord.set/Android.mk
-
-test_name := containers/unord/unord.set/db_iterators_7
-test_src := db_iterators_7.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/swap_member
-test_src := swap_member.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/erase_iter_iter_db4
-test_src := erase_iter_iter_db4.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/bucket_size
-test_src := bucket_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/bucket_count
-test_src := bucket_count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/max_load_factor
-test_src := max_load_factor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/emplace_hint
-test_src := emplace_hint.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/erase_iter_iter_db1
-test_src := erase_iter_iter_db1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/db_local_iterators_7
-test_src := db_local_iterators_7.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/insert_hint_const_lvalue
-test_src := insert_hint_const_lvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/erase_range
-test_src := erase_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/find_const
-test_src := find_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/max_bucket_count
-test_src := max_bucket_count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/erase_iter_iter_db3
-test_src := erase_iter_iter_db3.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/erase_key
-test_src := erase_key.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/erase_iter_db2
-test_src := erase_iter_db2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/insert_init
-test_src := insert_init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/erase_const_iter
-test_src := erase_const_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/local_iterators
-test_src := local_iterators.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/equal_range_const
-test_src := equal_range_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/insert_range
-test_src := insert_range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/max_size
-test_src := max_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/find_non_const
-test_src := find_non_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/iterators
-test_src := iterators.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/reserve
-test_src := reserve.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/bucket
-test_src := bucket.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/insert_rvalue
-test_src := insert_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/insert_hint_rvalue
-test_src := insert_hint_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/erase_iter_db1
-test_src := erase_iter_db1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/load_factor
-test_src := load_factor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/count
-test_src := count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/db_iterators_8
-test_src := db_iterators_8.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/db_local_iterators_8
-test_src := db_local_iterators_8.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/erase_iter_iter_db2
-test_src := erase_iter_iter_db2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/eq
-test_src := eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/insert_const_lvalue
-test_src := insert_const_lvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/rehash
-test_src := rehash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/equal_range_non_const
-test_src := equal_range_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/containers/unord/unord.set/unord.set.cnstr/Android.mk b/test/containers/unord/unord.set/unord.set.cnstr/Android.mk
deleted file mode 100644
index ce47f37..0000000
--- a/test/containers/unord/unord.set/unord.set.cnstr/Android.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# 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/containers/unord/unord.set/unord.set.cnstr/Android.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/size_hash
-test_src := size_hash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator
-test_src := range_size_hash_equal_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/init_size
-test_src := init_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/size_hash_equal
-test_src := size_hash_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/range_size_hash
-test_src := range_size_hash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal
-test_src := init_size_hash_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/init
-test_src := init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/assign_copy
-test_src := assign_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator
-test_src := init_size_hash_equal_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/copy_alloc
-test_src := copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/init_size_hash
-test_src := init_size_hash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/range_size
-test_src := range_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/allocator
-test_src := allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/range
-test_src := range.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator
-test_src := size_hash_equal_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/assign_move
-test_src := assign_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/assign_init
-test_src := assign_init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal
-test_src := range_size_hash_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.cnstr/move_alloc
-test_src := move_alloc.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/containers/unord/unord.set/unord.set.swap/Android.mk b/test/containers/unord/unord.set/unord.set.swap/Android.mk
deleted file mode 100644
index 55a2aa6..0000000
--- a/test/containers/unord/unord.set/unord.set.swap/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/containers/unord/unord.set/unord.set.swap/Android.mk
-
-test_name := containers/unord/unord.set/unord.set.swap/swap_non_member
-test_src := swap_non_member.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.swap/swap_noexcept
-test_src := swap_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := containers/unord/unord.set/unord.set.swap/db_swap_1
-test_src := db_swap_1.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/depr/Android.mk b/test/depr/Android.mk
deleted file mode 100644
index ee29f26..0000000
--- a/test/depr/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/Android.mk
-
-test_name := depr/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/depr/depr.auto.ptr/Android.mk b/test/depr/depr.auto.ptr/Android.mk
deleted file mode 100644
index 196c726..0000000
--- a/test/depr/depr.auto.ptr/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.auto.ptr/Android.mk
-
-test_name := depr/depr.auto.ptr/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/depr/depr.auto.ptr/auto.ptr/Android.mk b/test/depr/depr.auto.ptr/auto.ptr/Android.mk
deleted file mode 100644
index 5c6280c..0000000
--- a/test/depr/depr.auto.ptr/auto.ptr/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.auto.ptr/auto.ptr/Android.mk
-
-test_name := depr/depr.auto.ptr/auto.ptr/element_type
-test_src := element_type.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/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/Android.mk b/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/Android.mk
deleted file mode 100644
index 1358e7e..0000000
--- a/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/Android.mk
-
-test_name := depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert
-test_src := convert.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/assignment
-test_src := assignment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert_assignment
-test_src := convert_assignment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/copy
-test_src := 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/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/Android.mk b/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/Android.mk
deleted file mode 100644
index 09645e4..0000000
--- a/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/Android.mk
-
-test_name := depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/assign_from_auto_ptr_ref
-test_src := assign_from_auto_ptr_ref.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_from_auto_ptr_ref
-test_src := convert_from_auto_ptr_ref.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_to_auto_ptr
-test_src := convert_to_auto_ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_to_auto_ptr_ref
-test_src := convert_to_auto_ptr_ref.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/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/Android.mk b/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/Android.mk
deleted file mode 100644
index 14fb2fc..0000000
--- a/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/Android.mk
-
-test_name := depr/depr.auto.ptr/auto.ptr/auto.ptr.members/release
-test_src := release.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.auto.ptr/auto.ptr/auto.ptr.members/arrow
-test_src := arrow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.auto.ptr/auto.ptr/auto.ptr.members/reset
-test_src := reset.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.auto.ptr/auto.ptr/auto.ptr.members/deref
-test_src := deref.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/depr/depr.c.headers/Android.mk b/test/depr/depr.c.headers/Android.mk
deleted file mode 100644
index d0670a6..0000000
--- a/test/depr/depr.c.headers/Android.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# 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/depr/depr.c.headers/Android.mk
-
-test_name := depr/depr.c.headers/stdarg_h
-test_src := stdarg_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/string_h
-test_src := string_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/ciso646
-test_src := ciso646.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/tgmath_h
-test_src := tgmath_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/time_h
-test_src := time_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/stdlib_h
-test_src := stdlib_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/wchar_h
-test_src := wchar_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/ctype_h
-test_src := ctype_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/iso646_h
-test_src := iso646_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/errno_h
-test_src := errno_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/float_h
-test_src := float_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/locale_h
-test_src := locale_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/inttypes_h
-test_src := inttypes_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/wctype_h
-test_src := wctype_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/complex.h
-test_src := complex.h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/limits_h
-test_src := limits_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/signal_h
-test_src := signal_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/stdio_h
-test_src := stdio_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/stdint_h
-test_src := stdint_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/stdbool_h
-test_src := stdbool_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/assert_h
-test_src := assert_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/setjmp_h
-test_src := setjmp_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/stddef_h
-test_src := stddef_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.c.headers/fenv_h
-test_src := fenv_h.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/test/depr/depr.function.objects/Android.mk b/test/depr/depr.function.objects/Android.mk
deleted file mode 100644
index fc5d654..0000000
--- a/test/depr/depr.function.objects/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.function.objects/Android.mk
-
-test_name := depr/depr.function.objects/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/depr/depr.function.objects/depr.adaptors/Android.mk b/test/depr/depr.function.objects/depr.adaptors/Android.mk
deleted file mode 100644
index b4c34d7..0000000
--- a/test/depr/depr.function.objects/depr.adaptors/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.function.objects/depr.adaptors/Android.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/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/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/Android.mk b/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/Android.mk
deleted file mode 100644
index 82fb895..0000000
--- a/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/Android.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun1
-test_src := ptr_fun1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_binary_function
-test_src := pointer_to_binary_function.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun2
-test_src := ptr_fun2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_unary_function
-test_src := pointer_to_unary_function.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/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/Android.mk b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/Android.mk
deleted file mode 100644
index 350d5b7..0000000
--- a/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/Android.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# 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/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/Android.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_t
-test_src := const_mem_fun_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref1
-test_src := mem_fun_ref1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1
-test_src := const_mem_fun1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun
-test_src := mem_fun.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun
-test_src := const_mem_fun.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_t
-test_src := const_mem_fun1_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref
-test_src := const_mem_fun_ref.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref_t
-test_src := mem_fun_ref_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref
-test_src := mem_fun_ref.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_ref_t
-test_src := const_mem_fun1_ref_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref_t
-test_src := const_mem_fun_ref_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_ref_t
-test_src := mem_fun1_ref_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref1
-test_src := const_mem_fun_ref1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1
-test_src := mem_fun1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_t
-test_src := mem_fun_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_t
-test_src := mem_fun1_t.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/depr/depr.function.objects/depr.base/Android.mk b/test/depr/depr.function.objects/depr.base/Android.mk
deleted file mode 100644
index 8ca9980..0000000
--- a/test/depr/depr.function.objects/depr.base/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/depr/depr.function.objects/depr.base/Android.mk
-
-test_name := depr/depr.function.objects/depr.base/unary_function
-test_src := unary_function.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.function.objects/depr.base/binary_function
-test_src := binary_function.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/depr/depr.ios.members/Android.mk b/test/depr/depr.ios.members/Android.mk
deleted file mode 100644
index 650b1bf..0000000
--- a/test/depr/depr.ios.members/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/depr/depr.ios.members/Android.mk
-
-test_name := depr/depr.ios.members/streampos
-test_src := streampos.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.ios.members/seek_dir
-test_src := seek_dir.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.ios.members/io_state
-test_src := io_state.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.ios.members/open_mode
-test_src := open_mode.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.ios.members/streamoff
-test_src := streamoff.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/depr/depr.lib.binders/Android.mk b/test/depr/depr.lib.binders/Android.mk
deleted file mode 100644
index 137b591..0000000
--- a/test/depr/depr.lib.binders/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.lib.binders/Android.mk
-
-test_name := depr/depr.lib.binders/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/depr/depr.lib.binders/depr.lib.bind.1st/Android.mk b/test/depr/depr.lib.binders/depr.lib.bind.1st/Android.mk
deleted file mode 100644
index 093c074..0000000
--- a/test/depr/depr.lib.binders/depr.lib.bind.1st/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.lib.binders/depr.lib.bind.1st/Android.mk
-
-test_name := depr/depr.lib.binders/depr.lib.bind.1st/bind1st
-test_src := bind1st.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/depr/depr.lib.binders/depr.lib.bind.2nd/Android.mk b/test/depr/depr.lib.binders/depr.lib.bind.2nd/Android.mk
deleted file mode 100644
index ce695cb..0000000
--- a/test/depr/depr.lib.binders/depr.lib.bind.2nd/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.lib.binders/depr.lib.bind.2nd/Android.mk
-
-test_name := depr/depr.lib.binders/depr.lib.bind.2nd/bind2nd
-test_src := bind2nd.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/depr/depr.lib.binders/depr.lib.binder.1st/Android.mk b/test/depr/depr.lib.binders/depr.lib.binder.1st/Android.mk
deleted file mode 100644
index fa6fd05..0000000
--- a/test/depr/depr.lib.binders/depr.lib.binder.1st/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.lib.binders/depr.lib.binder.1st/Android.mk
-
-test_name := depr/depr.lib.binders/depr.lib.binder.1st/binder1st
-test_src := binder1st.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/depr/depr.lib.binders/depr.lib.binder.2nd/Android.mk b/test/depr/depr.lib.binders/depr.lib.binder.2nd/Android.mk
deleted file mode 100644
index 96b46fa..0000000
--- a/test/depr/depr.lib.binders/depr.lib.binder.2nd/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.lib.binders/depr.lib.binder.2nd/Android.mk
-
-test_name := depr/depr.lib.binders/depr.lib.binder.2nd/binder2nd
-test_src := binder2nd.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/depr/depr.str.strstreams/Android.mk b/test/depr/depr.str.strstreams/Android.mk
deleted file mode 100644
index 662cd84..0000000
--- a/test/depr/depr.str.strstreams/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/Android.mk
-
-test_name := depr/depr.str.strstreams/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/depr/depr.str.strstreams/depr.istrstream/Android.mk b/test/depr/depr.str.strstreams/depr.istrstream/Android.mk
deleted file mode 100644
index 6e13870..0000000
--- a/test/depr/depr.str.strstreams/depr.istrstream/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/depr.istrstream/Android.mk
-
-test_name := depr/depr.str.strstreams/depr.istrstream/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/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/Android.mk b/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/Android.mk
deleted file mode 100644
index 823d2f6..0000000
--- a/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/Android.mk
-
-test_name := depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/ccp
-test_src := ccp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/ccp_size
-test_src := ccp_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/cp
-test_src := cp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/cp_size
-test_src := cp_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/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/Android.mk b/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/Android.mk
deleted file mode 100644
index 9d71f9a..0000000
--- a/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/Android.mk
-
-test_name := depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/rdbuf
-test_src := rdbuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/str
-test_src := str.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/depr/depr.str.strstreams/depr.ostrstream/Android.mk b/test/depr/depr.str.strstreams/depr.ostrstream/Android.mk
deleted file mode 100644
index 211562f..0000000
--- a/test/depr/depr.str.strstreams/depr.ostrstream/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/depr.ostrstream/Android.mk
-
-test_name := depr/depr.str.strstreams/depr.ostrstream/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/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/Android.mk b/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/Android.mk
deleted file mode 100644
index fc75b49..0000000
--- a/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/Android.mk
-
-test_name := depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/cp_size_mode
-test_src := cp_size_mode.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/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/Android.mk b/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/Android.mk
deleted file mode 100644
index 2dc9617..0000000
--- a/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/Android.mk
-
-test_name := depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/rdbuf
-test_src := rdbuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/freeze
-test_src := freeze.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/pcount
-test_src := pcount.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/str
-test_src := str.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/depr/depr.str.strstreams/depr.strstream/Android.mk b/test/depr/depr.str.strstreams/depr.strstream/Android.mk
deleted file mode 100644
index dae9054..0000000
--- a/test/depr/depr.str.strstreams/depr.strstream/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/depr.strstream/Android.mk
-
-test_name := depr/depr.str.strstreams/depr.strstream/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/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/Android.mk b/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/Android.mk
deleted file mode 100644
index f6b29d0..0000000
--- a/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/Android.mk
-
-test_name := depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/cp_size_mode
-test_src := cp_size_mode.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/depr/depr.str.strstreams/depr.strstream/depr.strstream.dest/Android.mk b/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.dest/Android.mk
deleted file mode 100644
index 77947b7..0000000
--- a/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.dest/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/depr.strstream/depr.strstream.dest/Android.mk
-
-test_name := depr/depr.str.strstreams/depr.strstream/depr.strstream.dest/rdbuf
-test_src := rdbuf.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/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/Android.mk b/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/Android.mk
deleted file mode 100644
index 20f47e7..0000000
--- a/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/Android.mk
-
-test_name := depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/freeze
-test_src := freeze.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/pcount
-test_src := pcount.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/str
-test_src := str.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/depr/depr.str.strstreams/depr.strstreambuf/Android.mk b/test/depr/depr.str.strstreams/depr.strstreambuf/Android.mk
deleted file mode 100644
index 9e55ad6..0000000
--- a/test/depr/depr.str.strstreams/depr.strstreambuf/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/depr.strstreambuf/Android.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/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/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/Android.mk b/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/Android.mk
deleted file mode 100644
index 7b086e5..0000000
--- a/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/Android.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/ccp_size
-test_src := ccp_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cp_size_cp
-test_src := cp_size_cp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cucp_size
-test_src := cucp_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/custom_alloc
-test_src := custom_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/ucp_size_ucp
-test_src := ucp_size_ucp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/scp_size_scp
-test_src := scp_size_scp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cscp_size
-test_src := cscp_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/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/Android.mk b/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/Android.mk
deleted file mode 100644
index 32e2321..0000000
--- a/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/Android.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/freeze
-test_src := freeze.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/pcount
-test_src := pcount.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/str
-test_src := str.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/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/Android.mk b/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/Android.mk
deleted file mode 100644
index 895692f..0000000
--- a/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/Android.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/seekpos
-test_src := seekpos.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/overflow
-test_src := overflow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/pbackfail
-test_src := pbackfail.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/underflow
-test_src := underflow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/setbuf
-test_src := setbuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/seekoff
-test_src := seekoff.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/depr/exception.unexpected/Android.mk b/test/depr/exception.unexpected/Android.mk
deleted file mode 100644
index 2772b00..0000000
--- a/test/depr/exception.unexpected/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/exception.unexpected/Android.mk
-
-test_name := depr/exception.unexpected/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/depr/exception.unexpected/set.unexpected/Android.mk b/test/depr/exception.unexpected/set.unexpected/Android.mk
deleted file mode 100644
index 1605fee..0000000
--- a/test/depr/exception.unexpected/set.unexpected/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/depr/exception.unexpected/set.unexpected/Android.mk
-
-test_name := depr/exception.unexpected/set.unexpected/set_unexpected
-test_src := set_unexpected.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := depr/exception.unexpected/set.unexpected/get_unexpected
-test_src := get_unexpected.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/depr/exception.unexpected/unexpected.handler/Android.mk b/test/depr/exception.unexpected/unexpected.handler/Android.mk
deleted file mode 100644
index 90bd4c6..0000000
--- a/test/depr/exception.unexpected/unexpected.handler/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/exception.unexpected/unexpected.handler/Android.mk
-
-test_name := depr/exception.unexpected/unexpected.handler/unexpected_handler
-test_src := unexpected_handler.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/depr/exception.unexpected/unexpected/Android.mk b/test/depr/exception.unexpected/unexpected/Android.mk
deleted file mode 100644
index 0c7e690..0000000
--- a/test/depr/exception.unexpected/unexpected/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/depr/exception.unexpected/unexpected/Android.mk
-
-test_name := depr/exception.unexpected/unexpected/unexpected
-test_src := unexpected.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/diagnostics/Android.mk b/test/diagnostics/Android.mk
deleted file mode 100644
index d8584a2..0000000
--- a/test/diagnostics/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/Android.mk
-
-test_name := diagnostics/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/diagnostics/assertions/Android.mk b/test/diagnostics/assertions/Android.mk
deleted file mode 100644
index b6574f2..0000000
--- a/test/diagnostics/assertions/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/assertions/Android.mk
-
-test_name := diagnostics/assertions/cassert
-test_src := cassert.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/diagnostics/diagnostics.general/Android.mk b/test/diagnostics/diagnostics.general/Android.mk
deleted file mode 100644
index d372009..0000000
--- a/test/diagnostics/diagnostics.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/diagnostics.general/Android.mk
-
-test_name := diagnostics/diagnostics.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/diagnostics/errno/Android.mk b/test/diagnostics/errno/Android.mk
deleted file mode 100644
index 922bcb5..0000000
--- a/test/diagnostics/errno/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/errno/Android.mk
-
-test_name := diagnostics/errno/cerrno
-test_src := cerrno.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/diagnostics/std.exceptions/Android.mk b/test/diagnostics/std.exceptions/Android.mk
deleted file mode 100644
index e2d0a31..0000000
--- a/test/diagnostics/std.exceptions/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/std.exceptions/Android.mk
-
-test_name := diagnostics/std.exceptions/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/diagnostics/std.exceptions/domain.error/Android.mk b/test/diagnostics/std.exceptions/domain.error/Android.mk
deleted file mode 100644
index 18d7b28..0000000
--- a/test/diagnostics/std.exceptions/domain.error/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/std.exceptions/domain.error/Android.mk
-
-test_name := diagnostics/std.exceptions/domain.error/domain_error
-test_src := domain_error.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/diagnostics/std.exceptions/invalid.argument/Android.mk b/test/diagnostics/std.exceptions/invalid.argument/Android.mk
deleted file mode 100644
index bbb59be..0000000
--- a/test/diagnostics/std.exceptions/invalid.argument/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/std.exceptions/invalid.argument/Android.mk
-
-test_name := diagnostics/std.exceptions/invalid.argument/invalid_argument
-test_src := invalid_argument.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/diagnostics/std.exceptions/length.error/Android.mk b/test/diagnostics/std.exceptions/length.error/Android.mk
deleted file mode 100644
index 0564550..0000000
--- a/test/diagnostics/std.exceptions/length.error/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/std.exceptions/length.error/Android.mk
-
-test_name := diagnostics/std.exceptions/length.error/length_error
-test_src := length_error.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/diagnostics/std.exceptions/logic.error/Android.mk b/test/diagnostics/std.exceptions/logic.error/Android.mk
deleted file mode 100644
index 458f072..0000000
--- a/test/diagnostics/std.exceptions/logic.error/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/std.exceptions/logic.error/Android.mk
-
-test_name := diagnostics/std.exceptions/logic.error/logic_error
-test_src := logic_error.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/diagnostics/std.exceptions/out.of.range/Android.mk b/test/diagnostics/std.exceptions/out.of.range/Android.mk
deleted file mode 100644
index 2732e40..0000000
--- a/test/diagnostics/std.exceptions/out.of.range/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/std.exceptions/out.of.range/Android.mk
-
-test_name := diagnostics/std.exceptions/out.of.range/out_of_range
-test_src := out_of_range.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/diagnostics/std.exceptions/overflow.error/Android.mk b/test/diagnostics/std.exceptions/overflow.error/Android.mk
deleted file mode 100644
index ddbb56b..0000000
--- a/test/diagnostics/std.exceptions/overflow.error/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/std.exceptions/overflow.error/Android.mk
-
-test_name := diagnostics/std.exceptions/overflow.error/overflow_error
-test_src := overflow_error.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/diagnostics/std.exceptions/range.error/Android.mk b/test/diagnostics/std.exceptions/range.error/Android.mk
deleted file mode 100644
index 57e6121..0000000
--- a/test/diagnostics/std.exceptions/range.error/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/std.exceptions/range.error/Android.mk
-
-test_name := diagnostics/std.exceptions/range.error/range_error
-test_src := range_error.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/diagnostics/std.exceptions/runtime.error/Android.mk b/test/diagnostics/std.exceptions/runtime.error/Android.mk
deleted file mode 100644
index b6ddb39..0000000
--- a/test/diagnostics/std.exceptions/runtime.error/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/std.exceptions/runtime.error/Android.mk
-
-test_name := diagnostics/std.exceptions/runtime.error/runtime_error
-test_src := runtime_error.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/diagnostics/std.exceptions/underflow.error/Android.mk b/test/diagnostics/std.exceptions/underflow.error/Android.mk
deleted file mode 100644
index 92cd3b8..0000000
--- a/test/diagnostics/std.exceptions/underflow.error/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/std.exceptions/underflow.error/Android.mk
-
-test_name := diagnostics/std.exceptions/underflow.error/underflow_error
-test_src := underflow_error.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/diagnostics/syserr/Android.mk b/test/diagnostics/syserr/Android.mk
deleted file mode 100644
index 5187431..0000000
--- a/test/diagnostics/syserr/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/diagnostics/syserr/Android.mk
-
-test_name := diagnostics/syserr/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/errc
-test_src := errc.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/diagnostics/syserr/syserr.compare/Android.mk b/test/diagnostics/syserr/syserr.compare/Android.mk
deleted file mode 100644
index 236ed76..0000000
--- a/test/diagnostics/syserr/syserr.compare/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.compare/Android.mk
-
-test_name := diagnostics/syserr/syserr.compare/eq_error_code_error_code
-test_src := eq_error_code_error_code.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/diagnostics/syserr/syserr.errcat/Android.mk b/test/diagnostics/syserr/syserr.errcat/Android.mk
deleted file mode 100644
index 0ecef1e..0000000
--- a/test/diagnostics/syserr/syserr.errcat/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcat/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcat/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/diagnostics/syserr/syserr.errcat/syserr.errcat.derived/Android.mk b/test/diagnostics/syserr/syserr.errcat/syserr.errcat.derived/Android.mk
deleted file mode 100644
index 75cebdf..0000000
--- a/test/diagnostics/syserr/syserr.errcat/syserr.errcat.derived/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcat/syserr.errcat.derived/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcat/syserr.errcat.derived/message
-test_src := message.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/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/Android.mk b/test/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/Android.mk
deleted file mode 100644
index b4e148a..0000000
--- a/test/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/neq
-test_src := neq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/lt
-test_src := lt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/default_ctor
-test_src := default_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/eq
-test_src := 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/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/Android.mk b/test/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/Android.mk
deleted file mode 100644
index 280c780..0000000
--- a/test/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category
-test_src := system_category.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category
-test_src := generic_category.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/diagnostics/syserr/syserr.errcat/syserr.errcat.overview/Android.mk b/test/diagnostics/syserr/syserr.errcat/syserr.errcat.overview/Android.mk
deleted file mode 100644
index 90955c7..0000000
--- a/test/diagnostics/syserr/syserr.errcat/syserr.errcat.overview/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcat/syserr.errcat.overview/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcat/syserr.errcat.overview/error_category
-test_src := error_category.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/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/Android.mk b/test/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/Android.mk
deleted file mode 100644
index d248d8e..0000000
--- a/test/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/equivalent_error_code_int
-test_src := equivalent_error_code_int.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/default_error_condition
-test_src := default_error_condition.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/equivalent_int_error_condition
-test_src := equivalent_int_error_condition.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/diagnostics/syserr/syserr.errcode/Android.mk b/test/diagnostics/syserr/syserr.errcode/Android.mk
deleted file mode 100644
index cf06a65..0000000
--- a/test/diagnostics/syserr/syserr.errcode/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcode/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcode/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/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/Android.mk b/test/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/Android.mk
deleted file mode 100644
index 02474c1..0000000
--- a/test/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/int_error_category
-test_src := int_error_category.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/ErrorCodeEnum
-test_src := ErrorCodeEnum.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/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/Android.mk b/test/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/Android.mk
deleted file mode 100644
index 2e66ca8..0000000
--- a/test/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/ErrorCodeEnum
-test_src := ErrorCodeEnum.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/assign
-test_src := 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/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/Android.mk b/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/Android.mk
deleted file mode 100644
index e6aa0c7..0000000
--- a/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/lt
-test_src := lt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/make_error_code
-test_src := make_error_code.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/stream_inserter
-test_src := stream_inserter.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/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/Android.mk b/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/Android.mk
deleted file mode 100644
index 4f1c8bb..0000000
--- a/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.observers/bool
-test_src := bool.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.observers/default_error_condition
-test_src := default_error_condition.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.observers/category
-test_src := category.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.observers/message
-test_src := message.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.observers/value
-test_src := 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/diagnostics/syserr/syserr.errcode/syserr.errcode.overview/Android.mk b/test/diagnostics/syserr/syserr.errcode/syserr.errcode.overview/Android.mk
deleted file mode 100644
index 04bdd29..0000000
--- a/test/diagnostics/syserr/syserr.errcode/syserr.errcode.overview/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcode/syserr.errcode.overview/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcode/syserr.errcode.overview/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/diagnostics/syserr/syserr.errcondition/Android.mk b/test/diagnostics/syserr/syserr.errcondition/Android.mk
deleted file mode 100644
index 572619e..0000000
--- a/test/diagnostics/syserr/syserr.errcondition/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcondition/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcondition/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/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/Android.mk b/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/Android.mk
deleted file mode 100644
index 9df654d..0000000
--- a/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/int_error_category
-test_src := int_error_category.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/ErrorConditionEnum
-test_src := ErrorConditionEnum.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/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/Android.mk b/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/Android.mk
deleted file mode 100644
index 7f0da5e..0000000
--- a/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/ErrorConditionEnum
-test_src := ErrorConditionEnum.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/assign
-test_src := 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/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/Android.mk b/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/Android.mk
deleted file mode 100644
index 33831e4..0000000
--- a/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/make_error_condition
-test_src := make_error_condition.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/lt
-test_src := lt.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/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/Android.mk b/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/Android.mk
deleted file mode 100644
index dd40d31..0000000
--- a/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/bool
-test_src := bool.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/category
-test_src := category.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/message
-test_src := message.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/value
-test_src := 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/diagnostics/syserr/syserr.errcondition/syserr.errcondition.overview/Android.mk b/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.overview/Android.mk
deleted file mode 100644
index 53d176a..0000000
--- a/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.overview/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.errcondition/syserr.errcondition.overview/Android.mk
-
-test_name := diagnostics/syserr/syserr.errcondition/syserr.errcondition.overview/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/diagnostics/syserr/syserr.hash/Android.mk b/test/diagnostics/syserr/syserr.hash/Android.mk
deleted file mode 100644
index a4072fd..0000000
--- a/test/diagnostics/syserr/syserr.hash/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.hash/Android.mk
-
-test_name := diagnostics/syserr/syserr.hash/error_code
-test_src := error_code.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/diagnostics/syserr/syserr.syserr/Android.mk b/test/diagnostics/syserr/syserr.syserr/Android.mk
deleted file mode 100644
index d6025ce..0000000
--- a/test/diagnostics/syserr/syserr.syserr/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.syserr/Android.mk
-
-test_name := diagnostics/syserr/syserr.syserr/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/diagnostics/syserr/syserr.syserr/syserr.syserr.members/Android.mk b/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/Android.mk
deleted file mode 100644
index 53a6744..0000000
--- a/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.syserr/syserr.syserr.members/Android.mk
-
-test_name := diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_string
-test_src := ctor_error_code_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_const_char_pointer
-test_src := ctor_error_code_const_char_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_const_char_pointer
-test_src := ctor_int_error_category_const_char_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code
-test_src := ctor_error_code.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_string
-test_src := ctor_int_error_category_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category
-test_src := ctor_int_error_category.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/diagnostics/syserr/syserr.syserr/syserr.syserr.overview/Android.mk b/test/diagnostics/syserr/syserr.syserr/syserr.syserr.overview/Android.mk
deleted file mode 100644
index ac0b5ea..0000000
--- a/test/diagnostics/syserr/syserr.syserr/syserr.syserr.overview/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/diagnostics/syserr/syserr.syserr/syserr.syserr.overview/Android.mk
-
-test_name := diagnostics/syserr/syserr.syserr/syserr.syserr.overview/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/extensions/Android.mk b/test/extensions/Android.mk
deleted file mode 100644
index ac9db44..0000000
--- a/test/extensions/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/extensions/Android.mk
-
-test_name := extensions/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/extensions/hash/Android.mk b/test/extensions/hash/Android.mk
deleted file mode 100644
index 9070e6d..0000000
--- a/test/extensions/hash/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/extensions/hash/Android.mk
-
-test_name := extensions/hash/specializations
-test_src := specializations.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/extensions/hash_map/Android.mk b/test/extensions/hash_map/Android.mk
deleted file mode 100644
index bd83820..0000000
--- a/test/extensions/hash_map/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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/extensions/hash_map/Android.mk
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/test/input.output/Android.mk b/test/input.output/Android.mk
deleted file mode 100644
index 3dedc4f..0000000
--- a/test/input.output/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/Android.mk
-
-test_name := input.output/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/input.output/file.streams/Android.mk b/test/input.output/file.streams/Android.mk
deleted file mode 100644
index 0e3b93a..0000000
--- a/test/input.output/file.streams/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/file.streams/Android.mk
-
-test_name := input.output/file.streams/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/input.output/file.streams/c.files/Android.mk b/test/input.output/file.streams/c.files/Android.mk
deleted file mode 100644
index 1476fb4..0000000
--- a/test/input.output/file.streams/c.files/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/file.streams/c.files/Android.mk
-
-test_name := input.output/file.streams/c.files/cinttypes
-test_src := cinttypes.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/c.files/version_cinttypes
-test_src := version_cinttypes.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/c.files/version_ccstdio
-test_src := version_ccstdio.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/test/input.output/file.streams/fstreams/Android.mk b/test/input.output/file.streams/fstreams/Android.mk
deleted file mode 100644
index 10b2d19..0000000
--- a/test/input.output/file.streams/fstreams/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/Android.mk
-
-test_name := input.output/file.streams/fstreams/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/input.output/file.streams/fstreams/filebuf.assign/Android.mk b/test/input.output/file.streams/fstreams/filebuf.assign/Android.mk
deleted file mode 100644
index fe9d38d..0000000
--- a/test/input.output/file.streams/fstreams/filebuf.assign/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/filebuf.assign/Android.mk
-
-test_name := input.output/file.streams/fstreams/filebuf.assign/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/filebuf.assign/nonmember_swap
-test_src := nonmember_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/filebuf.assign/move_assign
-test_src := move_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/input.output/file.streams/fstreams/filebuf.cons/Android.mk b/test/input.output/file.streams/fstreams/filebuf.cons/Android.mk
deleted file mode 100644
index 91720a5..0000000
--- a/test/input.output/file.streams/fstreams/filebuf.cons/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/filebuf.cons/Android.mk
-
-test_name := input.output/file.streams/fstreams/filebuf.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/filebuf.cons/move
-test_src := move.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/input.output/file.streams/fstreams/filebuf.members/Android.mk b/test/input.output/file.streams/fstreams/filebuf.members/Android.mk
deleted file mode 100644
index cf58495..0000000
--- a/test/input.output/file.streams/fstreams/filebuf.members/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/filebuf.members/Android.mk
-
-test_name := input.output/file.streams/fstreams/filebuf.members/open_pointer
-test_src := open_pointer.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/input.output/file.streams/fstreams/filebuf.virtuals/Android.mk b/test/input.output/file.streams/fstreams/filebuf.virtuals/Android.mk
deleted file mode 100644
index fa65cb9..0000000
--- a/test/input.output/file.streams/fstreams/filebuf.virtuals/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/filebuf.virtuals/Android.mk
-
-test_name := input.output/file.streams/fstreams/filebuf.virtuals/overflow
-test_src := overflow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/filebuf.virtuals/pbackfail
-test_src := pbackfail.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/filebuf.virtuals/underflow
-test_src := underflow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/filebuf.virtuals/seekoff
-test_src := seekoff.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/input.output/file.streams/fstreams/filebuf/Android.mk b/test/input.output/file.streams/fstreams/filebuf/Android.mk
deleted file mode 100644
index 0d47719..0000000
--- a/test/input.output/file.streams/fstreams/filebuf/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/filebuf/Android.mk
-
-test_name := input.output/file.streams/fstreams/filebuf/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/input.output/file.streams/fstreams/fstream.assign/Android.mk b/test/input.output/file.streams/fstreams/fstream.assign/Android.mk
deleted file mode 100644
index 653340a..0000000
--- a/test/input.output/file.streams/fstreams/fstream.assign/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/fstream.assign/Android.mk
-
-test_name := input.output/file.streams/fstreams/fstream.assign/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/fstream.assign/nonmember_swap
-test_src := nonmember_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/fstream.assign/move_assign
-test_src := move_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/input.output/file.streams/fstreams/fstream.cons/Android.mk b/test/input.output/file.streams/fstreams/fstream.cons/Android.mk
deleted file mode 100644
index e326ca7..0000000
--- a/test/input.output/file.streams/fstreams/fstream.cons/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/fstream.cons/Android.mk
-
-test_name := input.output/file.streams/fstreams/fstream.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/fstream.cons/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/fstream.cons/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/fstream.cons/move
-test_src := move.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/input.output/file.streams/fstreams/fstream.members/Android.mk b/test/input.output/file.streams/fstreams/fstream.members/Android.mk
deleted file mode 100644
index 6277fb1..0000000
--- a/test/input.output/file.streams/fstreams/fstream.members/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/fstream.members/Android.mk
-
-test_name := input.output/file.streams/fstreams/fstream.members/open_pointer
-test_src := open_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/fstream.members/open_string
-test_src := open_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/fstream.members/rdbuf
-test_src := rdbuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/fstream.members/close
-test_src := close.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/input.output/file.streams/fstreams/fstream/Android.mk b/test/input.output/file.streams/fstreams/fstream/Android.mk
deleted file mode 100644
index 3bf10cf..0000000
--- a/test/input.output/file.streams/fstreams/fstream/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/fstream/Android.mk
-
-test_name := input.output/file.streams/fstreams/fstream/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/input.output/file.streams/fstreams/ifstream.assign/Android.mk b/test/input.output/file.streams/fstreams/ifstream.assign/Android.mk
deleted file mode 100644
index 1ec5740..0000000
--- a/test/input.output/file.streams/fstreams/ifstream.assign/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/ifstream.assign/Android.mk
-
-test_name := input.output/file.streams/fstreams/ifstream.assign/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ifstream.assign/nonmember_swap
-test_src := nonmember_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ifstream.assign/move_assign
-test_src := move_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/input.output/file.streams/fstreams/ifstream.cons/Android.mk b/test/input.output/file.streams/fstreams/ifstream.cons/Android.mk
deleted file mode 100644
index 5f89bce..0000000
--- a/test/input.output/file.streams/fstreams/ifstream.cons/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/ifstream.cons/Android.mk
-
-test_name := input.output/file.streams/fstreams/ifstream.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ifstream.cons/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ifstream.cons/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ifstream.cons/move
-test_src := move.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/input.output/file.streams/fstreams/ifstream.members/Android.mk b/test/input.output/file.streams/fstreams/ifstream.members/Android.mk
deleted file mode 100644
index ecf66ab..0000000
--- a/test/input.output/file.streams/fstreams/ifstream.members/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/ifstream.members/Android.mk
-
-test_name := input.output/file.streams/fstreams/ifstream.members/open_pointer
-test_src := open_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ifstream.members/open_string
-test_src := open_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ifstream.members/rdbuf
-test_src := rdbuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ifstream.members/close
-test_src := close.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/input.output/file.streams/fstreams/ifstream/Android.mk b/test/input.output/file.streams/fstreams/ifstream/Android.mk
deleted file mode 100644
index 3003838..0000000
--- a/test/input.output/file.streams/fstreams/ifstream/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/ifstream/Android.mk
-
-test_name := input.output/file.streams/fstreams/ifstream/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/input.output/file.streams/fstreams/ofstream.assign/Android.mk b/test/input.output/file.streams/fstreams/ofstream.assign/Android.mk
deleted file mode 100644
index b85b40d..0000000
--- a/test/input.output/file.streams/fstreams/ofstream.assign/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/ofstream.assign/Android.mk
-
-test_name := input.output/file.streams/fstreams/ofstream.assign/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ofstream.assign/nonmember_swap
-test_src := nonmember_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ofstream.assign/move_assign
-test_src := move_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/input.output/file.streams/fstreams/ofstream.cons/Android.mk b/test/input.output/file.streams/fstreams/ofstream.cons/Android.mk
deleted file mode 100644
index 2268d64..0000000
--- a/test/input.output/file.streams/fstreams/ofstream.cons/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/ofstream.cons/Android.mk
-
-test_name := input.output/file.streams/fstreams/ofstream.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ofstream.cons/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ofstream.cons/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ofstream.cons/move
-test_src := move.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/input.output/file.streams/fstreams/ofstream.members/Android.mk b/test/input.output/file.streams/fstreams/ofstream.members/Android.mk
deleted file mode 100644
index 8d1533f..0000000
--- a/test/input.output/file.streams/fstreams/ofstream.members/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/ofstream.members/Android.mk
-
-test_name := input.output/file.streams/fstreams/ofstream.members/open_pointer
-test_src := open_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ofstream.members/open_string
-test_src := open_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ofstream.members/rdbuf
-test_src := rdbuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/file.streams/fstreams/ofstream.members/close
-test_src := close.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/input.output/file.streams/fstreams/ofstream/Android.mk b/test/input.output/file.streams/fstreams/ofstream/Android.mk
deleted file mode 100644
index 7aa400c..0000000
--- a/test/input.output/file.streams/fstreams/ofstream/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/file.streams/fstreams/ofstream/Android.mk
-
-test_name := input.output/file.streams/fstreams/ofstream/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/input.output/input.output.general/Android.mk b/test/input.output/input.output.general/Android.mk
deleted file mode 100644
index 0f41180..0000000
--- a/test/input.output/input.output.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/input.output.general/Android.mk
-
-test_name := input.output/input.output.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/input.output/iostream.format/Android.mk b/test/input.output/iostream.format/Android.mk
deleted file mode 100644
index a614863..0000000
--- a/test/input.output/iostream.format/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/Android.mk
-
-test_name := input.output/iostream.format/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/input.output/iostream.format/ext.manip/Android.mk b/test/input.output/iostream.format/ext.manip/Android.mk
deleted file mode 100644
index f9c5912..0000000
--- a/test/input.output/iostream.format/ext.manip/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/iostream.format/ext.manip/Android.mk
-
-test_name := input.output/iostream.format/ext.manip/get_money
-test_src := get_money.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/ext.manip/get_time
-test_src := get_time.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/ext.manip/put_time
-test_src := put_time.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/ext.manip/put_money
-test_src := put_money.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/input.output/iostream.format/input.streams/Android.mk b/test/input.output/iostream.format/input.streams/Android.mk
deleted file mode 100644
index b3b03e6..0000000
--- a/test/input.output/iostream.format/input.streams/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/Android.mk
-
-test_name := input.output/iostream.format/input.streams/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/input.output/iostream.format/input.streams/iostreamclass/Android.mk b/test/input.output/iostream.format/input.streams/iostreamclass/Android.mk
deleted file mode 100644
index f7db172..0000000
--- a/test/input.output/iostream.format/input.streams/iostreamclass/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/iostreamclass/Android.mk
-
-test_name := input.output/iostream.format/input.streams/iostreamclass/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/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/Android.mk b/test/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/Android.mk
deleted file mode 100644
index d99a4ce..0000000
--- a/test/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/Android.mk
-
-test_name := input.output/iostream.format/input.streams/iostreamclass/iostream.assign/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/iostreamclass/iostream.assign/move_assign
-test_src := move_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/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/Android.mk b/test/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/Android.mk
deleted file mode 100644
index 27a4bd1..0000000
--- a/test/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/Android.mk
-
-test_name := input.output/iostream.format/input.streams/iostreamclass/iostream.cons/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/iostreamclass/iostream.cons/streambuf
-test_src := streambuf.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/input.output/iostream.format/input.streams/iostreamclass/iostream.dest/Android.mk b/test/input.output/iostream.format/input.streams/iostreamclass/iostream.dest/Android.mk
deleted file mode 100644
index b1f9ef9..0000000
--- a/test/input.output/iostream.format/input.streams/iostreamclass/iostream.dest/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/iostreamclass/iostream.dest/Android.mk
-
-test_name := input.output/iostream.format/input.streams/iostreamclass/iostream.dest/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/input.output/iostream.format/input.streams/istream.formatted/Android.mk b/test/input.output/iostream.format/input.streams/istream.formatted/Android.mk
deleted file mode 100644
index 9dca7b7..0000000
--- a/test/input.output/iostream.format/input.streams/istream.formatted/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/istream.formatted/Android.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/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/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/Android.mk b/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/Android.mk
deleted file mode 100644
index f828e0e..0000000
--- a/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/Android.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/Android.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/bool
-test_src := bool.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_short
-test_src := unsigned_short.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/int
-test_src := int.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_double
-test_src := long_double.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/short
-test_src := short.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_int
-test_src := unsigned_int.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long
-test_src := unsigned_long.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_long
-test_src := long_long.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/float
-test_src := float.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long_long
-test_src := unsigned_long_long.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/double
-test_src := double.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long
-test_src := long.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/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.reqmts/Android.mk b/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.reqmts/Android.mk
deleted file mode 100644
index 6bf8528..0000000
--- a/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.reqmts/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.reqmts/Android.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream.formatted.reqmts/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/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/Android.mk b/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/Android.mk
deleted file mode 100644
index 39d053c..0000000
--- a/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/Android.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char
-test_src := signed_char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char_pointer
-test_src := unsigned_char_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char
-test_src := unsigned_char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream_extractors/basic_ios
-test_src := basic_ios.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf
-test_src := streambuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream_extractors/ios_base
-test_src := ios_base.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char_pointer
-test_src := signed_char_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream_extractors/chart
-test_src := chart.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream_extractors/wchar_t_pointer
-test_src := wchar_t_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.formatted/istream_extractors/istream
-test_src := istream.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/input.output/iostream.format/input.streams/istream.manip/Android.mk b/test/input.output/iostream.format/input.streams/istream.manip/Android.mk
deleted file mode 100644
index c303bde..0000000
--- a/test/input.output/iostream.format/input.streams/istream.manip/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/istream.manip/Android.mk
-
-test_name := input.output/iostream.format/input.streams/istream.manip/ws
-test_src := ws.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/input.output/iostream.format/input.streams/istream.rvalue/Android.mk b/test/input.output/iostream.format/input.streams/istream.rvalue/Android.mk
deleted file mode 100644
index 418d9b7..0000000
--- a/test/input.output/iostream.format/input.streams/istream.rvalue/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/istream.rvalue/Android.mk
-
-test_name := input.output/iostream.format/input.streams/istream.rvalue/rvalue
-test_src := rvalue.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/input.output/iostream.format/input.streams/istream.unformatted/Android.mk b/test/input.output/iostream.format/input.streams/istream.unformatted/Android.mk
deleted file mode 100644
index 438713c..0000000
--- a/test/input.output/iostream.format/input.streams/istream.unformatted/Android.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/istream.unformatted/Android.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/peek
-test_src := peek.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/sync
-test_src := sync.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/unget
-test_src := unget.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size_chart
-test_src := get_pointer_size_chart.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/ignore
-test_src := ignore.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/putback
-test_src := putback.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/get_streambuf
-test_src := get_streambuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size
-test_src := getline_pointer_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/read
-test_src := read.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/get_chart
-test_src := get_chart.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/seekg
-test_src := seekg.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/get
-test_src := get.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/ignore_0xff
-test_src := ignore_0xff.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart
-test_src := get_streambuf_chart.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/seekg_off
-test_src := seekg_off.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/readsome
-test_src := readsome.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/tellg
-test_src := tellg.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size_chart
-test_src := getline_pointer_size_chart.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size
-test_src := get_pointer_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/input.output/iostream.format/input.streams/istream/Android.mk b/test/input.output/iostream.format/input.streams/istream/Android.mk
deleted file mode 100644
index 69948e6..0000000
--- a/test/input.output/iostream.format/input.streams/istream/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/istream/Android.mk
-
-test_name := input.output/iostream.format/input.streams/istream/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/input.output/iostream.format/input.streams/istream/istream.assign/Android.mk b/test/input.output/iostream.format/input.streams/istream/istream.assign/Android.mk
deleted file mode 100644
index f85460d..0000000
--- a/test/input.output/iostream.format/input.streams/istream/istream.assign/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/istream/istream.assign/Android.mk
-
-test_name := input.output/iostream.format/input.streams/istream/istream.assign/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream/istream.assign/move_assign
-test_src := move_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/input.output/iostream.format/input.streams/istream/istream.cons/Android.mk b/test/input.output/iostream.format/input.streams/istream/istream.cons/Android.mk
deleted file mode 100644
index 9f4c57b..0000000
--- a/test/input.output/iostream.format/input.streams/istream/istream.cons/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/istream/istream.cons/Android.mk
-
-test_name := input.output/iostream.format/input.streams/istream/istream.cons/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/input.streams/istream/istream.cons/streambuf
-test_src := streambuf.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/input.output/iostream.format/input.streams/istream/istream_sentry/Android.mk b/test/input.output/iostream.format/input.streams/istream/istream_sentry/Android.mk
deleted file mode 100644
index 4d55c29..0000000
--- a/test/input.output/iostream.format/input.streams/istream/istream_sentry/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/input.streams/istream/istream_sentry/Android.mk
-
-test_name := input.output/iostream.format/input.streams/istream/istream_sentry/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/input.output/iostream.format/output.streams/Android.mk b/test/input.output/iostream.format/output.streams/Android.mk
deleted file mode 100644
index 883884d..0000000
--- a/test/input.output/iostream.format/output.streams/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/output.streams/Android.mk
-
-test_name := input.output/iostream.format/output.streams/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/input.output/iostream.format/output.streams/ostream.assign/Android.mk b/test/input.output/iostream.format/output.streams/ostream.assign/Android.mk
deleted file mode 100644
index 553627d..0000000
--- a/test/input.output/iostream.format/output.streams/ostream.assign/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/iostream.format/output.streams/ostream.assign/Android.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.assign/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.assign/move_assign
-test_src := move_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/input.output/iostream.format/output.streams/ostream.cons/Android.mk b/test/input.output/iostream.format/output.streams/ostream.cons/Android.mk
deleted file mode 100644
index 2101d86..0000000
--- a/test/input.output/iostream.format/output.streams/ostream.cons/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/iostream.format/output.streams/ostream.cons/Android.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.cons/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.cons/streambuf
-test_src := streambuf.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/input.output/iostream.format/output.streams/ostream.formatted/Android.mk b/test/input.output/iostream.format/output.streams/ostream.formatted/Android.mk
deleted file mode 100644
index 2c4ca29..0000000
--- a/test/input.output/iostream.format/output.streams/ostream.formatted/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/output.streams/ostream.formatted/Android.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/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/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.reqmts/Android.mk b/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.reqmts/Android.mk
deleted file mode 100644
index 32ba29c..0000000
--- a/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.reqmts/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.reqmts/Android.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.reqmts/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/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/Android.mk b/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/Android.mk
deleted file mode 100644
index 27a9596..0000000
--- a/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/Android.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# 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/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/Android.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool
-test_src := bool.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short
-test_src := unsigned_short.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int
-test_src := int.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double
-test_src := long_double.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short
-test_src := short.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int
-test_src := unsigned_int.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long
-test_src := unsigned_long.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long
-test_src := long_long.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float
-test_src := float.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long
-test_src := unsigned_long_long.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double
-test_src := double.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long
-test_src := long.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/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/Android.mk b/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/Android.mk
deleted file mode 100644
index 6a406a7..0000000
--- a/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/Android.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT
-test_src := CharT.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char
-test_src := signed_char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer
-test_src := char_to_wide_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer
-test_src := unsigned_char_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char
-test_src := char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char
-test_src := unsigned_char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide
-test_src := char_to_wide.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer
-test_src := char_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer
-test_src := signed_char_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer
-test_src := CharT_pointer.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/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/Android.mk b/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/Android.mk
deleted file mode 100644
index 9e4791c..0000000
--- a/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/Android.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ostream
-test_src := ostream.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/basic_ios
-test_src := basic_ios.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/streambuf
-test_src := streambuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ios_base
-test_src := ios_base.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/input.output/iostream.format/output.streams/ostream.manip/Android.mk b/test/input.output/iostream.format/output.streams/ostream.manip/Android.mk
deleted file mode 100644
index 395214c..0000000
--- a/test/input.output/iostream.format/output.streams/ostream.manip/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/iostream.format/output.streams/ostream.manip/Android.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.manip/flush
-test_src := flush.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.manip/ends
-test_src := ends.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.manip/endl
-test_src := endl.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/input.output/iostream.format/output.streams/ostream.rvalue/Android.mk b/test/input.output/iostream.format/output.streams/ostream.rvalue/Android.mk
deleted file mode 100644
index 85d3b76..0000000
--- a/test/input.output/iostream.format/output.streams/ostream.rvalue/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/output.streams/ostream.rvalue/Android.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.rvalue/CharT_pointer
-test_src := CharT_pointer.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/input.output/iostream.format/output.streams/ostream.seeks/Android.mk b/test/input.output/iostream.format/output.streams/ostream.seeks/Android.mk
deleted file mode 100644
index 853621c..0000000
--- a/test/input.output/iostream.format/output.streams/ostream.seeks/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/iostream.format/output.streams/ostream.seeks/Android.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.seeks/seekp2
-test_src := seekp2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.seeks/seekp
-test_src := seekp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.seeks/tellp
-test_src := tellp.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/input.output/iostream.format/output.streams/ostream.unformatted/Android.mk b/test/input.output/iostream.format/output.streams/ostream.unformatted/Android.mk
deleted file mode 100644
index 290acc9..0000000
--- a/test/input.output/iostream.format/output.streams/ostream.unformatted/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/iostream.format/output.streams/ostream.unformatted/Android.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.unformatted/flush
-test_src := flush.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.unformatted/put
-test_src := put.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream.unformatted/write
-test_src := write.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/input.output/iostream.format/output.streams/ostream/Android.mk b/test/input.output/iostream.format/output.streams/ostream/Android.mk
deleted file mode 100644
index b02be94..0000000
--- a/test/input.output/iostream.format/output.streams/ostream/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/output.streams/ostream/Android.mk
-
-test_name := input.output/iostream.format/output.streams/ostream/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/input.output/iostream.format/output.streams/ostream_sentry/Android.mk b/test/input.output/iostream.format/output.streams/ostream_sentry/Android.mk
deleted file mode 100644
index df313f5..0000000
--- a/test/input.output/iostream.format/output.streams/ostream_sentry/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/iostream.format/output.streams/ostream_sentry/Android.mk
-
-test_name := input.output/iostream.format/output.streams/ostream_sentry/construct
-test_src := construct.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/output.streams/ostream_sentry/destruct
-test_src := destruct.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/input.output/iostream.format/quoted.manip/Android.mk b/test/input.output/iostream.format/quoted.manip/Android.mk
deleted file mode 100644
index ce4b369..0000000
--- a/test/input.output/iostream.format/quoted.manip/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.format/quoted.manip/Android.mk
-
-test_name := input.output/iostream.format/quoted.manip/quoted
-test_src := quoted.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/input.output/iostream.format/std.manip/Android.mk b/test/input.output/iostream.format/std.manip/Android.mk
deleted file mode 100644
index a946f4b..0000000
--- a/test/input.output/iostream.format/std.manip/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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/input.output/iostream.format/std.manip/Android.mk
-
-test_name := input.output/iostream.format/std.manip/setbase
-test_src := setbase.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/std.manip/setprecision
-test_src := setprecision.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/std.manip/setfill
-test_src := setfill.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/std.manip/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/std.manip/setiosflags
-test_src := setiosflags.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/std.manip/setw
-test_src := setw.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.format/std.manip/resetiosflags
-test_src := resetiosflags.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/input.output/iostream.forward/Android.mk b/test/input.output/iostream.forward/Android.mk
deleted file mode 100644
index 6a4b2b2..0000000
--- a/test/input.output/iostream.forward/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/iostream.forward/Android.mk
-
-test_name := input.output/iostream.forward/iosfwd
-test_src := iosfwd.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.forward/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/input.output/iostream.objects/Android.mk b/test/input.output/iostream.objects/Android.mk
deleted file mode 100644
index fbda5e4..0000000
--- a/test/input.output/iostream.objects/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostream.objects/Android.mk
-
-test_name := input.output/iostream.objects/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/input.output/iostream.objects/narrow.stream.objects/Android.mk b/test/input.output/iostream.objects/narrow.stream.objects/Android.mk
deleted file mode 100644
index aafcd73..0000000
--- a/test/input.output/iostream.objects/narrow.stream.objects/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/iostream.objects/narrow.stream.objects/Android.mk
-
-test_name := input.output/iostream.objects/narrow.stream.objects/cout
-test_src := cout.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.objects/narrow.stream.objects/cerr
-test_src := cerr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.objects/narrow.stream.objects/clog
-test_src := clog.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.objects/narrow.stream.objects/cin
-test_src := cin.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/input.output/iostream.objects/wide.stream.objects/Android.mk b/test/input.output/iostream.objects/wide.stream.objects/Android.mk
deleted file mode 100644
index 88e57a4..0000000
--- a/test/input.output/iostream.objects/wide.stream.objects/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/iostream.objects/wide.stream.objects/Android.mk
-
-test_name := input.output/iostream.objects/wide.stream.objects/wclog
-test_src := wclog.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.objects/wide.stream.objects/wcerr
-test_src := wcerr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.objects/wide.stream.objects/wcout
-test_src := wcout.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostream.objects/wide.stream.objects/wcin
-test_src := wcin.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/input.output/iostreams.base/Android.mk b/test/input.output/iostreams.base/Android.mk
deleted file mode 100644
index b2f8a52..0000000
--- a/test/input.output/iostreams.base/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/Android.mk
-
-test_name := input.output/iostreams.base/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/input.output/iostreams.base/fpos/Android.mk b/test/input.output/iostreams.base/fpos/Android.mk
deleted file mode 100644
index 973e03f..0000000
--- a/test/input.output/iostreams.base/fpos/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/fpos/Android.mk
-
-test_name := input.output/iostreams.base/fpos/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/input.output/iostreams.base/fpos/fpos.members/Android.mk b/test/input.output/iostreams.base/fpos/fpos.members/Android.mk
deleted file mode 100644
index fa021ae..0000000
--- a/test/input.output/iostreams.base/fpos/fpos.members/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/fpos/fpos.members/Android.mk
-
-test_name := input.output/iostreams.base/fpos/fpos.members/state
-test_src := state.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/input.output/iostreams.base/fpos/fpos.operations/Android.mk b/test/input.output/iostreams.base/fpos/fpos.operations/Android.mk
deleted file mode 100644
index e213738..0000000
--- a/test/input.output/iostreams.base/fpos/fpos.operations/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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/input.output/iostreams.base/fpos/fpos.operations/Android.mk
-
-test_name := input.output/iostreams.base/fpos/fpos.operations/offset
-test_src := offset.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/fpos/fpos.operations/addition
-test_src := addition.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/fpos/fpos.operations/subtraction
-test_src := subtraction.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/fpos/fpos.operations/streamsize
-test_src := streamsize.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/fpos/fpos.operations/eq_int
-test_src := eq_int.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/fpos/fpos.operations/ctor_int
-test_src := ctor_int.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/fpos/fpos.operations/difference
-test_src := 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/input.output/iostreams.base/ios.base/Android.mk b/test/input.output/iostreams.base/ios.base/Android.mk
deleted file mode 100644
index e2d4b31..0000000
--- a/test/input.output/iostreams.base/ios.base/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios.base/Android.mk
-
-test_name := input.output/iostreams.base/ios.base/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/input.output/iostreams.base/ios.base/fmtflags.state/Android.mk b/test/input.output/iostreams.base/ios.base/fmtflags.state/Android.mk
deleted file mode 100644
index a131ca0..0000000
--- a/test/input.output/iostreams.base/ios.base/fmtflags.state/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios.base/fmtflags.state/Android.mk
-
-test_name := input.output/iostreams.base/ios.base/fmtflags.state/unsetf_mask
-test_src := unsetf_mask.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios.base/fmtflags.state/width
-test_src := width.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios.base/fmtflags.state/precision
-test_src := precision.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios.base/fmtflags.state/setf_fmtflags
-test_src := setf_fmtflags.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios.base/fmtflags.state/flags_fmtflags
-test_src := flags_fmtflags.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios.base/fmtflags.state/flags
-test_src := flags.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios.base/fmtflags.state/width_streamsize
-test_src := width_streamsize.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios.base/fmtflags.state/setf_fmtflags_mask
-test_src := setf_fmtflags_mask.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios.base/fmtflags.state/precision_streamsize
-test_src := precision_streamsize.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/input.output/iostreams.base/ios.base/ios.base.callback/Android.mk b/test/input.output/iostreams.base/ios.base/ios.base.callback/Android.mk
deleted file mode 100644
index 68cf373..0000000
--- a/test/input.output/iostreams.base/ios.base/ios.base.callback/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios.base/ios.base.callback/Android.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.base.callback/register_callback
-test_src := register_callback.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/input.output/iostreams.base/ios.base/ios.base.cons/Android.mk b/test/input.output/iostreams.base/ios.base/ios.base.cons/Android.mk
deleted file mode 100644
index 712fba2..0000000
--- a/test/input.output/iostreams.base/ios.base/ios.base.cons/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios.base/ios.base.cons/Android.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.base.cons/dtor
-test_src := dtor.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/input.output/iostreams.base/ios.base/ios.base.locales/Android.mk b/test/input.output/iostreams.base/ios.base/ios.base.locales/Android.mk
deleted file mode 100644
index 9a09571..0000000
--- a/test/input.output/iostreams.base/ios.base/ios.base.locales/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios.base/ios.base.locales/Android.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.base.locales/imbue
-test_src := imbue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.base.locales/getloc
-test_src := getloc.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/input.output/iostreams.base/ios.base/ios.base.storage/Android.mk b/test/input.output/iostreams.base/ios.base/ios.base.storage/Android.mk
deleted file mode 100644
index 49831a0..0000000
--- a/test/input.output/iostreams.base/ios.base/ios.base.storage/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios.base/ios.base.storage/Android.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.base.storage/iword
-test_src := iword.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.base.storage/xalloc
-test_src := xalloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.base.storage/pword
-test_src := pword.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/input.output/iostreams.base/ios.base/ios.members.static/Android.mk b/test/input.output/iostreams.base/ios.base/ios.members.static/Android.mk
deleted file mode 100644
index 41e0f36..0000000
--- a/test/input.output/iostreams.base/ios.base/ios.members.static/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios.base/ios.members.static/Android.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.members.static/sync_with_stdio
-test_src := sync_with_stdio.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/input.output/iostreams.base/ios.base/ios.types/Android.mk b/test/input.output/iostreams.base/ios.base/ios.types/Android.mk
deleted file mode 100644
index 5bdcdcb..0000000
--- a/test/input.output/iostreams.base/ios.base/ios.types/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios.base/ios.types/Android.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.types/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/input.output/iostreams.base/ios.base/ios.types/ios_Init/Android.mk b/test/input.output/iostreams.base/ios.base/ios.types/ios_Init/Android.mk
deleted file mode 100644
index 9a1a827..0000000
--- a/test/input.output/iostreams.base/ios.base/ios.types/ios_Init/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios.base/ios.types/ios_Init/Android.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.types/ios_Init/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/input.output/iostreams.base/ios.base/ios.types/ios_failure/Android.mk b/test/input.output/iostreams.base/ios.base/ios.types/ios_failure/Android.mk
deleted file mode 100644
index b1cd362..0000000
--- a/test/input.output/iostreams.base/ios.base/ios.types/ios_failure/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios.base/ios.types/ios_failure/Android.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_string_error_code
-test_src := ctor_string_error_code.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_char_pointer_error_code
-test_src := ctor_char_pointer_error_code.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/input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/Android.mk b/test/input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/Android.mk
deleted file mode 100644
index 1708e87..0000000
--- a/test/input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/Android.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/fmtflags
-test_src := fmtflags.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/input.output/iostreams.base/ios.base/ios.types/ios_iostate/Android.mk b/test/input.output/iostreams.base/ios.base/ios.types/ios_iostate/Android.mk
deleted file mode 100644
index de2bffe..0000000
--- a/test/input.output/iostreams.base/ios.base/ios.types/ios_iostate/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios.base/ios.types/ios_iostate/Android.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.types/ios_iostate/iostate
-test_src := iostate.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/input.output/iostreams.base/ios.base/ios.types/ios_openmode/Android.mk b/test/input.output/iostreams.base/ios.base/ios.types/ios_openmode/Android.mk
deleted file mode 100644
index e726d58..0000000
--- a/test/input.output/iostreams.base/ios.base/ios.types/ios_openmode/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios.base/ios.types/ios_openmode/Android.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.types/ios_openmode/openmode
-test_src := openmode.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/input.output/iostreams.base/ios.base/ios.types/ios_seekdir/Android.mk b/test/input.output/iostreams.base/ios.base/ios.types/ios_seekdir/Android.mk
deleted file mode 100644
index 2a7f042..0000000
--- a/test/input.output/iostreams.base/ios.base/ios.types/ios_seekdir/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios.base/ios.types/ios_seekdir/Android.mk
-
-test_name := input.output/iostreams.base/ios.base/ios.types/ios_seekdir/seekdir
-test_src := seekdir.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/input.output/iostreams.base/ios/Android.mk b/test/input.output/iostreams.base/ios/Android.mk
deleted file mode 100644
index bede7da..0000000
--- a/test/input.output/iostreams.base/ios/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios/Android.mk
-
-test_name := input.output/iostreams.base/ios/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/input.output/iostreams.base/ios/basic.ios.cons/Android.mk b/test/input.output/iostreams.base/ios/basic.ios.cons/Android.mk
deleted file mode 100644
index db1c079..0000000
--- a/test/input.output/iostreams.base/ios/basic.ios.cons/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios/basic.ios.cons/Android.mk
-
-test_name := input.output/iostreams.base/ios/basic.ios.cons/ctor_streambuf
-test_src := ctor_streambuf.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/input.output/iostreams.base/ios/basic.ios.members/Android.mk b/test/input.output/iostreams.base/ios/basic.ios.members/Android.mk
deleted file mode 100644
index a0dc02c..0000000
--- a/test/input.output/iostreams.base/ios/basic.ios.members/Android.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios/basic.ios.members/Android.mk
-
-test_name := input.output/iostreams.base/ios/basic.ios.members/narow
-test_src := narow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/basic.ios.members/tie
-test_src := tie.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/basic.ios.members/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/basic.ios.members/rdbuf_streambuf
-test_src := rdbuf_streambuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/basic.ios.members/copyfmt
-test_src := copyfmt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/basic.ios.members/rdbuf
-test_src := rdbuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/basic.ios.members/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/basic.ios.members/tie_ostream
-test_src := tie_ostream.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/basic.ios.members/widen
-test_src := widen.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/basic.ios.members/imbue
-test_src := imbue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/basic.ios.members/fill_char_type
-test_src := fill_char_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/basic.ios.members/set_rdbuf
-test_src := set_rdbuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/basic.ios.members/fill
-test_src := fill.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/input.output/iostreams.base/ios/iostate.flags/Android.mk b/test/input.output/iostreams.base/ios/iostate.flags/Android.mk
deleted file mode 100644
index 69b6ee0..0000000
--- a/test/input.output/iostreams.base/ios/iostate.flags/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# 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/input.output/iostreams.base/ios/iostate.flags/Android.mk
-
-test_name := input.output/iostreams.base/ios/iostate.flags/bool
-test_src := bool.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/iostate.flags/good
-test_src := good.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/iostate.flags/not
-test_src := not.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/iostate.flags/setstate
-test_src := setstate.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/iostate.flags/rdstate
-test_src := rdstate.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/iostate.flags/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/iostate.flags/exceptions_iostate
-test_src := exceptions_iostate.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/iostate.flags/bad
-test_src := bad.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/iostate.flags/fail
-test_src := fail.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/iostate.flags/exceptions
-test_src := exceptions.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/ios/iostate.flags/eof
-test_src := eof.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/input.output/iostreams.base/std.ios.manip/Android.mk b/test/input.output/iostreams.base/std.ios.manip/Android.mk
deleted file mode 100644
index 38d5e3c..0000000
--- a/test/input.output/iostreams.base/std.ios.manip/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.base/std.ios.manip/Android.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/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/input.output/iostreams.base/std.ios.manip/adjustfield.manip/Android.mk b/test/input.output/iostreams.base/std.ios.manip/adjustfield.manip/Android.mk
deleted file mode 100644
index 6be03dc..0000000
--- a/test/input.output/iostreams.base/std.ios.manip/adjustfield.manip/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/iostreams.base/std.ios.manip/adjustfield.manip/Android.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/adjustfield.manip/internal
-test_src := internal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/adjustfield.manip/right
-test_src := right.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/adjustfield.manip/left
-test_src := left.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/input.output/iostreams.base/std.ios.manip/basefield.manip/Android.mk b/test/input.output/iostreams.base/std.ios.manip/basefield.manip/Android.mk
deleted file mode 100644
index 4e3c2eb..0000000
--- a/test/input.output/iostreams.base/std.ios.manip/basefield.manip/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/iostreams.base/std.ios.manip/basefield.manip/Android.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/basefield.manip/dec
-test_src := dec.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/basefield.manip/hex
-test_src := hex.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/basefield.manip/oct
-test_src := oct.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/input.output/iostreams.base/std.ios.manip/error.reporting/Android.mk b/test/input.output/iostreams.base/std.ios.manip/error.reporting/Android.mk
deleted file mode 100644
index 35fd816..0000000
--- a/test/input.output/iostreams.base/std.ios.manip/error.reporting/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/iostreams.base/std.ios.manip/error.reporting/Android.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/error.reporting/make_error_condition
-test_src := make_error_condition.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/error.reporting/iostream_category
-test_src := iostream_category.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/error.reporting/make_error_code
-test_src := make_error_code.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/input.output/iostreams.base/std.ios.manip/floatfield.manip/Android.mk b/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/Android.mk
deleted file mode 100644
index 17064ee..0000000
--- a/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/iostreams.base/std.ios.manip/floatfield.manip/Android.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/floatfield.manip/fixed
-test_src := fixed.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/floatfield.manip/hexfloat
-test_src := hexfloat.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/floatfield.manip/scientific
-test_src := scientific.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/floatfield.manip/defaultfloat
-test_src := defaultfloat.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/input.output/iostreams.base/std.ios.manip/fmtflags.manip/Android.mk b/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/Android.mk
deleted file mode 100644
index 7bc6294..0000000
--- a/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/Android.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# 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/input.output/iostreams.base/std.ios.manip/fmtflags.manip/Android.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/fmtflags.manip/unitbuf
-test_src := unitbuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/fmtflags.manip/noskipws
-test_src := noskipws.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/fmtflags.manip/nounitbuf
-test_src := nounitbuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowpoint
-test_src := noshowpoint.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/fmtflags.manip/showbase
-test_src := showbase.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/fmtflags.manip/skipws
-test_src := skipws.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/fmtflags.manip/uppercase
-test_src := uppercase.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/fmtflags.manip/showpoint
-test_src := showpoint.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowbase
-test_src := noshowbase.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/fmtflags.manip/showpos
-test_src := showpos.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/fmtflags.manip/noboolalpha
-test_src := noboolalpha.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowpos
-test_src := noshowpos.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/fmtflags.manip/nouppercase
-test_src := nouppercase.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/std.ios.manip/fmtflags.manip/boolalpha
-test_src := boolalpha.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/input.output/iostreams.base/stream.types/Android.mk b/test/input.output/iostreams.base/stream.types/Android.mk
deleted file mode 100644
index c4e7ff5..0000000
--- a/test/input.output/iostreams.base/stream.types/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/iostreams.base/stream.types/Android.mk
-
-test_name := input.output/iostreams.base/stream.types/streamsize
-test_src := streamsize.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/iostreams.base/stream.types/streamoff
-test_src := streamoff.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/input.output/iostreams.requirements/Android.mk b/test/input.output/iostreams.requirements/Android.mk
deleted file mode 100644
index a3aad82..0000000
--- a/test/input.output/iostreams.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.requirements/Android.mk
-
-test_name := input.output/iostreams.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/input.output/iostreams.requirements/iostream.limits.imbue/Android.mk b/test/input.output/iostreams.requirements/iostream.limits.imbue/Android.mk
deleted file mode 100644
index 94431fd..0000000
--- a/test/input.output/iostreams.requirements/iostream.limits.imbue/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.requirements/iostream.limits.imbue/Android.mk
-
-test_name := input.output/iostreams.requirements/iostream.limits.imbue/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/input.output/iostreams.requirements/iostreams.limits.pos/Android.mk b/test/input.output/iostreams.requirements/iostreams.limits.pos/Android.mk
deleted file mode 100644
index 9ba5924..0000000
--- a/test/input.output/iostreams.requirements/iostreams.limits.pos/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.requirements/iostreams.limits.pos/Android.mk
-
-test_name := input.output/iostreams.requirements/iostreams.limits.pos/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/input.output/iostreams.requirements/iostreams.threadsafety/Android.mk b/test/input.output/iostreams.requirements/iostreams.threadsafety/Android.mk
deleted file mode 100644
index bb723bc..0000000
--- a/test/input.output/iostreams.requirements/iostreams.threadsafety/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/iostreams.requirements/iostreams.threadsafety/Android.mk
-
-test_name := input.output/iostreams.requirements/iostreams.threadsafety/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/input.output/stream.buffers/Android.mk b/test/input.output/stream.buffers/Android.mk
deleted file mode 100644
index 78c4586..0000000
--- a/test/input.output/stream.buffers/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/stream.buffers/Android.mk
-
-test_name := input.output/stream.buffers/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/input.output/stream.buffers/streambuf.reqts/Android.mk b/test/input.output/stream.buffers/streambuf.reqts/Android.mk
deleted file mode 100644
index da3ba16..0000000
--- a/test/input.output/stream.buffers/streambuf.reqts/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf.reqts/Android.mk
-
-test_name := input.output/stream.buffers/streambuf.reqts/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/input.output/stream.buffers/streambuf/Android.mk b/test/input.output/stream.buffers/streambuf/Android.mk
deleted file mode 100644
index 8500d7c..0000000
--- a/test/input.output/stream.buffers/streambuf/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/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/input.output/stream.buffers/streambuf/streambuf.cons/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.cons/Android.mk
deleted file mode 100644
index babf85c..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.cons/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.cons/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.cons/copy
-test_src := 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/input.output/stream.buffers/streambuf/streambuf.members/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.members/Android.mk
deleted file mode 100644
index 64007a9..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.members/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.members/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/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/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/Android.mk
deleted file mode 100644
index 0bdafed..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekpos
-test_src := pubseekpos.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubsync
-test_src := pubsync.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubsetbuf
-test_src := pubsetbuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekoff
-test_src := pubseekoff.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/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/Android.mk
deleted file mode 100644
index 239dd28..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/locales
-test_src := locales.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/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/Android.mk
deleted file mode 100644
index d44481b..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/in_avail
-test_src := in_avail.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sgetn
-test_src := sgetn.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sbumpc
-test_src := sbumpc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sgetc
-test_src := sgetc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/snextc
-test_src := snextc.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/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.pback/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.pback/Android.mk
deleted file mode 100644
index ece9e66..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.pback/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.pback/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.pback/sungetc
-test_src := sungetc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.pback/sputbackc
-test_src := sputbackc.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/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.put/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.put/Android.mk
deleted file mode 100644
index 22106e9..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.put/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.put/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.put/sputc
-test_src := sputc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.put/sputn
-test_src := sputn.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/input.output/stream.buffers/streambuf/streambuf.protected/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.protected/Android.mk
deleted file mode 100644
index 147fa3d..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.protected/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.protected/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.protected/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/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/Android.mk
deleted file mode 100644
index 2ce87a0..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign
-test_src := 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/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.get.area/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.get.area/Android.mk
deleted file mode 100644
index 1bca3ae..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.get.area/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.get.area/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.protected/streambuf.get.area/gbump
-test_src := gbump.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.protected/streambuf.get.area/setg
-test_src := setg.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/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/Android.mk
deleted file mode 100644
index b0b7831..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/setp
-test_src := setp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump
-test_src := pbump.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/input.output/stream.buffers/streambuf/streambuf.virtuals/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.virtuals/Android.mk
deleted file mode 100644
index 68eaece..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.virtuals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.virtuals/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.virtuals/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/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.buffer/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.buffer/Android.mk
deleted file mode 100644
index da88a41..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.buffer/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.buffer/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.buffer/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/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/Android.mk
deleted file mode 100644
index e2b266a..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/showmanyc
-test_src := showmanyc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/uflow
-test_src := uflow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/xsgetn
-test_src := xsgetn.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/underflow
-test_src := underflow.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/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.locales/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.locales/Android.mk
deleted file mode 100644
index 6b3dbc0..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.locales/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.locales/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.locales/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/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.pback/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.pback/Android.mk
deleted file mode 100644
index 429bbdd..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.pback/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.pback/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.pback/pbackfail
-test_src := pbackfail.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/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/Android.mk b/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/Android.mk
deleted file mode 100644
index f9fab77..0000000
--- a/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/Android.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/xsputn
-test_src := xsputn.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/overflow
-test_src := overflow.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/input.output/string.streams/Android.mk b/test/input.output/string.streams/Android.mk
deleted file mode 100644
index 32ef21a..0000000
--- a/test/input.output/string.streams/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/string.streams/Android.mk
-
-test_name := input.output/string.streams/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/input.output/string.streams/istringstream/Android.mk b/test/input.output/string.streams/istringstream/Android.mk
deleted file mode 100644
index 1fcf538..0000000
--- a/test/input.output/string.streams/istringstream/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/string.streams/istringstream/Android.mk
-
-test_name := input.output/string.streams/istringstream/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/input.output/string.streams/istringstream/istringstream.assign/Android.mk b/test/input.output/string.streams/istringstream/istringstream.assign/Android.mk
deleted file mode 100644
index 445f45a..0000000
--- a/test/input.output/string.streams/istringstream/istringstream.assign/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/string.streams/istringstream/istringstream.assign/Android.mk
-
-test_name := input.output/string.streams/istringstream/istringstream.assign/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/istringstream/istringstream.assign/nonmember_swap
-test_src := nonmember_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/istringstream/istringstream.assign/move
-test_src := move.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/input.output/string.streams/istringstream/istringstream.cons/Android.mk b/test/input.output/string.streams/istringstream/istringstream.cons/Android.mk
deleted file mode 100644
index d21ceb8..0000000
--- a/test/input.output/string.streams/istringstream/istringstream.cons/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/string.streams/istringstream/istringstream.cons/Android.mk
-
-test_name := input.output/string.streams/istringstream/istringstream.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/istringstream/istringstream.cons/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/istringstream/istringstream.cons/move
-test_src := move.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/input.output/string.streams/istringstream/istringstream.members/Android.mk b/test/input.output/string.streams/istringstream/istringstream.members/Android.mk
deleted file mode 100644
index 8d48b80..0000000
--- a/test/input.output/string.streams/istringstream/istringstream.members/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/string.streams/istringstream/istringstream.members/Android.mk
-
-test_name := input.output/string.streams/istringstream/istringstream.members/str
-test_src := str.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/input.output/string.streams/ostringstream/Android.mk b/test/input.output/string.streams/ostringstream/Android.mk
deleted file mode 100644
index 3b9c6d7..0000000
--- a/test/input.output/string.streams/ostringstream/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/string.streams/ostringstream/Android.mk
-
-test_name := input.output/string.streams/ostringstream/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/input.output/string.streams/ostringstream/ostringstream.assign/Android.mk b/test/input.output/string.streams/ostringstream/ostringstream.assign/Android.mk
deleted file mode 100644
index 4dd911c..0000000
--- a/test/input.output/string.streams/ostringstream/ostringstream.assign/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/string.streams/ostringstream/ostringstream.assign/Android.mk
-
-test_name := input.output/string.streams/ostringstream/ostringstream.assign/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/ostringstream/ostringstream.assign/nonmember_swap
-test_src := nonmember_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/ostringstream/ostringstream.assign/move
-test_src := move.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/input.output/string.streams/ostringstream/ostringstream.cons/Android.mk b/test/input.output/string.streams/ostringstream/ostringstream.cons/Android.mk
deleted file mode 100644
index f05b682..0000000
--- a/test/input.output/string.streams/ostringstream/ostringstream.cons/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/string.streams/ostringstream/ostringstream.cons/Android.mk
-
-test_name := input.output/string.streams/ostringstream/ostringstream.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/ostringstream/ostringstream.cons/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/ostringstream/ostringstream.cons/move
-test_src := move.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/input.output/string.streams/ostringstream/ostringstream.members/Android.mk b/test/input.output/string.streams/ostringstream/ostringstream.members/Android.mk
deleted file mode 100644
index bc97aa9..0000000
--- a/test/input.output/string.streams/ostringstream/ostringstream.members/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/string.streams/ostringstream/ostringstream.members/Android.mk
-
-test_name := input.output/string.streams/ostringstream/ostringstream.members/str
-test_src := str.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/input.output/string.streams/stringbuf/Android.mk b/test/input.output/string.streams/stringbuf/Android.mk
deleted file mode 100644
index 6263e30..0000000
--- a/test/input.output/string.streams/stringbuf/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/string.streams/stringbuf/Android.mk
-
-test_name := input.output/string.streams/stringbuf/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/input.output/string.streams/stringbuf/stringbuf.assign/Android.mk b/test/input.output/string.streams/stringbuf/stringbuf.assign/Android.mk
deleted file mode 100644
index cd97026..0000000
--- a/test/input.output/string.streams/stringbuf/stringbuf.assign/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/string.streams/stringbuf/stringbuf.assign/Android.mk
-
-test_name := input.output/string.streams/stringbuf/stringbuf.assign/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/stringbuf/stringbuf.assign/nonmember_swap
-test_src := nonmember_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/stringbuf/stringbuf.assign/move
-test_src := move.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/input.output/string.streams/stringbuf/stringbuf.cons/Android.mk b/test/input.output/string.streams/stringbuf/stringbuf.cons/Android.mk
deleted file mode 100644
index 3fdc6a8..0000000
--- a/test/input.output/string.streams/stringbuf/stringbuf.cons/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/string.streams/stringbuf/stringbuf.cons/Android.mk
-
-test_name := input.output/string.streams/stringbuf/stringbuf.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/stringbuf/stringbuf.cons/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/stringbuf/stringbuf.cons/move
-test_src := move.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/input.output/string.streams/stringbuf/stringbuf.members/Android.mk b/test/input.output/string.streams/stringbuf/stringbuf.members/Android.mk
deleted file mode 100644
index 483218a..0000000
--- a/test/input.output/string.streams/stringbuf/stringbuf.members/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/string.streams/stringbuf/stringbuf.members/Android.mk
-
-test_name := input.output/string.streams/stringbuf/stringbuf.members/str
-test_src := str.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/input.output/string.streams/stringbuf/stringbuf.virtuals/Android.mk b/test/input.output/string.streams/stringbuf/stringbuf.virtuals/Android.mk
deleted file mode 100644
index 8b17ccb..0000000
--- a/test/input.output/string.streams/stringbuf/stringbuf.virtuals/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/input.output/string.streams/stringbuf/stringbuf.virtuals/Android.mk
-
-test_name := input.output/string.streams/stringbuf/stringbuf.virtuals/seekpos
-test_src := seekpos.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/stringbuf/stringbuf.virtuals/overflow
-test_src := overflow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/stringbuf/stringbuf.virtuals/pbackfail
-test_src := pbackfail.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/stringbuf/stringbuf.virtuals/underflow
-test_src := underflow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/stringbuf/stringbuf.virtuals/setbuf
-test_src := setbuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/stringbuf/stringbuf.virtuals/seekoff
-test_src := seekoff.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/input.output/string.streams/stringstream.cons/Android.mk b/test/input.output/string.streams/stringstream.cons/Android.mk
deleted file mode 100644
index fe4ff63..0000000
--- a/test/input.output/string.streams/stringstream.cons/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/input.output/string.streams/stringstream.cons/Android.mk
-
-test_name := input.output/string.streams/stringstream.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/stringstream.cons/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/stringstream.cons/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/stringstream.cons/move2
-test_src := move2.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/input.output/string.streams/stringstream.cons/stringstream.assign/Android.mk b/test/input.output/string.streams/stringstream.cons/stringstream.assign/Android.mk
deleted file mode 100644
index 15a11d8..0000000
--- a/test/input.output/string.streams/stringstream.cons/stringstream.assign/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/input.output/string.streams/stringstream.cons/stringstream.assign/Android.mk
-
-test_name := input.output/string.streams/stringstream.cons/stringstream.assign/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/stringstream.cons/stringstream.assign/nonmember_swap
-test_src := nonmember_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := input.output/string.streams/stringstream.cons/stringstream.assign/move
-test_src := move.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/input.output/string.streams/stringstream.members/Android.mk b/test/input.output/string.streams/stringstream.members/Android.mk
deleted file mode 100644
index 1088ebc..0000000
--- a/test/input.output/string.streams/stringstream.members/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/string.streams/stringstream.members/Android.mk
-
-test_name := input.output/string.streams/stringstream.members/str
-test_src := str.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/input.output/string.streams/stringstream/Android.mk b/test/input.output/string.streams/stringstream/Android.mk
deleted file mode 100644
index 25317d8..0000000
--- a/test/input.output/string.streams/stringstream/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/input.output/string.streams/stringstream/Android.mk
-
-test_name := input.output/string.streams/stringstream/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/iterators/Android.mk b/test/iterators/Android.mk
deleted file mode 100644
index e9204b9..0000000
--- a/test/iterators/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/Android.mk
-
-test_name := iterators/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/iterators/iterator.primitives/Android.mk b/test/iterators/iterator.primitives/Android.mk
deleted file mode 100644
index 5260651..0000000
--- a/test/iterators/iterator.primitives/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/iterator.primitives/Android.mk
-
-test_name := iterators/iterator.primitives/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/iterators/iterator.primitives/iterator.basic/Android.mk b/test/iterators/iterator.primitives/iterator.basic/Android.mk
deleted file mode 100644
index 250fb57..0000000
--- a/test/iterators/iterator.primitives/iterator.basic/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/iterator.primitives/iterator.basic/Android.mk
-
-test_name := iterators/iterator.primitives/iterator.basic/iterator
-test_src := iterator.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/iterators/iterator.primitives/iterator.operations/Android.mk b/test/iterators/iterator.primitives/iterator.operations/Android.mk
deleted file mode 100644
index 15d0124..0000000
--- a/test/iterators/iterator.primitives/iterator.operations/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/iterators/iterator.primitives/iterator.operations/Android.mk
-
-test_name := iterators/iterator.primitives/iterator.operations/prev
-test_src := prev.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/iterator.primitives/iterator.operations/next
-test_src := next.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/iterator.primitives/iterator.operations/advance
-test_src := advance.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/iterator.primitives/iterator.operations/distance
-test_src := distance.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/iterators/iterator.primitives/iterator.traits/Android.mk b/test/iterators/iterator.primitives/iterator.traits/Android.mk
deleted file mode 100644
index 5da5b81..0000000
--- a/test/iterators/iterator.primitives/iterator.traits/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/iterators/iterator.primitives/iterator.traits/Android.mk
-
-test_name := iterators/iterator.primitives/iterator.traits/const_pointer
-test_src := const_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/iterator.primitives/iterator.traits/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/iterator.primitives/iterator.traits/iterator
-test_src := iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/iterator.primitives/iterator.traits/empty
-test_src := empty.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/iterators/iterator.primitives/std.iterator.tags/Android.mk b/test/iterators/iterator.primitives/std.iterator.tags/Android.mk
deleted file mode 100644
index 036b605..0000000
--- a/test/iterators/iterator.primitives/std.iterator.tags/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/iterators/iterator.primitives/std.iterator.tags/Android.mk
-
-test_name := iterators/iterator.primitives/std.iterator.tags/input_iterator_tag
-test_src := input_iterator_tag.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/iterator.primitives/std.iterator.tags/output_iterator_tag
-test_src := output_iterator_tag.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/iterator.primitives/std.iterator.tags/forward_iterator_tag
-test_src := forward_iterator_tag.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/iterator.primitives/std.iterator.tags/bidirectional_iterator_tag
-test_src := bidirectional_iterator_tag.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/iterator.primitives/std.iterator.tags/random_access_iterator_tag
-test_src := random_access_iterator_tag.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/iterators/iterator.range/Android.mk b/test/iterators/iterator.range/Android.mk
deleted file mode 100644
index a9b92e0..0000000
--- a/test/iterators/iterator.range/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/iterator.range/Android.mk
-
-test_name := iterators/iterator.range/begin-end
-test_src := begin-end.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/iterators/iterator.requirements/Android.mk b/test/iterators/iterator.requirements/Android.mk
deleted file mode 100644
index 3efbba6..0000000
--- a/test/iterators/iterator.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/iterator.requirements/Android.mk
-
-test_name := iterators/iterator.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/iterators/iterator.requirements/bidirectional.iterators/Android.mk b/test/iterators/iterator.requirements/bidirectional.iterators/Android.mk
deleted file mode 100644
index a275d91..0000000
--- a/test/iterators/iterator.requirements/bidirectional.iterators/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/iterator.requirements/bidirectional.iterators/Android.mk
-
-test_name := iterators/iterator.requirements/bidirectional.iterators/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/iterators/iterator.requirements/forward.iterators/Android.mk b/test/iterators/iterator.requirements/forward.iterators/Android.mk
deleted file mode 100644
index dcb71d4..0000000
--- a/test/iterators/iterator.requirements/forward.iterators/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/iterator.requirements/forward.iterators/Android.mk
-
-test_name := iterators/iterator.requirements/forward.iterators/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/iterators/iterator.requirements/input.iterators/Android.mk b/test/iterators/iterator.requirements/input.iterators/Android.mk
deleted file mode 100644
index b3b02e1..0000000
--- a/test/iterators/iterator.requirements/input.iterators/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/iterator.requirements/input.iterators/Android.mk
-
-test_name := iterators/iterator.requirements/input.iterators/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/iterators/iterator.requirements/iterator.iterators/Android.mk b/test/iterators/iterator.requirements/iterator.iterators/Android.mk
deleted file mode 100644
index 61aa9b3..0000000
--- a/test/iterators/iterator.requirements/iterator.iterators/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/iterator.requirements/iterator.iterators/Android.mk
-
-test_name := iterators/iterator.requirements/iterator.iterators/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/iterators/iterator.requirements/iterator.requirements.general/Android.mk b/test/iterators/iterator.requirements/iterator.requirements.general/Android.mk
deleted file mode 100644
index 93b32a3..0000000
--- a/test/iterators/iterator.requirements/iterator.requirements.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/iterator.requirements/iterator.requirements.general/Android.mk
-
-test_name := iterators/iterator.requirements/iterator.requirements.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/iterators/iterator.requirements/output.iterators/Android.mk b/test/iterators/iterator.requirements/output.iterators/Android.mk
deleted file mode 100644
index 790c82b..0000000
--- a/test/iterators/iterator.requirements/output.iterators/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/iterator.requirements/output.iterators/Android.mk
-
-test_name := iterators/iterator.requirements/output.iterators/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/iterators/iterator.requirements/random.access.iterators/Android.mk b/test/iterators/iterator.requirements/random.access.iterators/Android.mk
deleted file mode 100644
index a2e4a50..0000000
--- a/test/iterators/iterator.requirements/random.access.iterators/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/iterator.requirements/random.access.iterators/Android.mk
-
-test_name := iterators/iterator.requirements/random.access.iterators/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/iterators/iterator.synopsis/Android.mk b/test/iterators/iterator.synopsis/Android.mk
deleted file mode 100644
index 82e7a93..0000000
--- a/test/iterators/iterator.synopsis/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/iterator.synopsis/Android.mk
-
-test_name := iterators/iterator.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/iterators/iterators.general/Android.mk b/test/iterators/iterators.general/Android.mk
deleted file mode 100644
index 3110d75..0000000
--- a/test/iterators/iterators.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/iterators.general/Android.mk
-
-test_name := iterators/iterators.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/iterators/predef.iterators/Android.mk b/test/iterators/predef.iterators/Android.mk
deleted file mode 100644
index f3e877a..0000000
--- a/test/iterators/predef.iterators/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/Android.mk
-
-test_name := iterators/predef.iterators/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/iterators/predef.iterators/insert.iterators/Android.mk b/test/iterators/predef.iterators/insert.iterators/Android.mk
deleted file mode 100644
index 370b37b..0000000
--- a/test/iterators/predef.iterators/insert.iterators/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/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/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/Android.mk b/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/Android.mk
deleted file mode 100644
index 7177dbe..0000000
--- a/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/back.insert.iter.ops/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/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/Android.mk b/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/Android.mk
deleted file mode 100644
index 37d4eda..0000000
--- a/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container
-test_src := container.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/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/Android.mk b/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/Android.mk
deleted file mode 100644
index cf0a9df..0000000
--- a/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/post
-test_src := post.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/pre
-test_src := pre.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/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op=/Android.mk b/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op=/Android.mk
deleted file mode 100644
index 7372d11..0000000
--- a/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op=/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op=/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op=/lv_value
-test_src := lv_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op=/rv_value
-test_src := rv_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/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/Android.mk b/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/Android.mk
deleted file mode 100644
index 2ad2d9b..0000000
--- a/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/test
-test_src := test.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/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/Android.mk b/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/Android.mk
deleted file mode 100644
index d7a2b6a..0000000
--- a/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/test
-test_src := test.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/iterators/predef.iterators/insert.iterators/back.insert.iterator/Android.mk b/test/iterators/predef.iterators/insert.iterators/back.insert.iterator/Android.mk
deleted file mode 100644
index 5931df3..0000000
--- a/test/iterators/predef.iterators/insert.iterators/back.insert.iterator/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/back.insert.iterator/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/back.insert.iterator/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/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/Android.mk b/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/Android.mk
deleted file mode 100644
index d4cb5ed..0000000
--- a/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/front.insert.iter.ops/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/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/Android.mk b/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/Android.mk
deleted file mode 100644
index 87759d7..0000000
--- a/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container
-test_src := container.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/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/Android.mk b/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/Android.mk
deleted file mode 100644
index 6929fcd..0000000
--- a/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/post
-test_src := post.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/pre
-test_src := pre.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/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/Android.mk b/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/Android.mk
deleted file mode 100644
index 8fcae91..0000000
--- a/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/lv_value
-test_src := lv_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/rv_value
-test_src := rv_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/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/Android.mk b/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/Android.mk
deleted file mode 100644
index a26b3f5..0000000
--- a/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/test
-test_src := test.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/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/Android.mk b/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/Android.mk
deleted file mode 100644
index bf75b17..0000000
--- a/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/test
-test_src := test.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/iterators/predef.iterators/insert.iterators/front.insert.iterator/Android.mk b/test/iterators/predef.iterators/insert.iterators/front.insert.iterator/Android.mk
deleted file mode 100644
index 095a2f6..0000000
--- a/test/iterators/predef.iterators/insert.iterators/front.insert.iterator/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/front.insert.iterator/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/front.insert.iterator/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/iterators/predef.iterators/insert.iterators/insert.iter.ops/Android.mk b/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/Android.mk
deleted file mode 100644
index 82c05f5..0000000
--- a/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/insert.iter.ops/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/insert.iter.ops/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/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/Android.mk b/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/Android.mk
deleted file mode 100644
index 4315cde..0000000
--- a/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/test
-test_src := test.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/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/Android.mk b/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/Android.mk
deleted file mode 100644
index cca6444..0000000
--- a/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/post
-test_src := post.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/pre
-test_src := pre.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/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/Android.mk b/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/Android.mk
deleted file mode 100644
index 307f431..0000000
--- a/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/lv_value
-test_src := lv_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/rv_value
-test_src := rv_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/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/Android.mk b/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/Android.mk
deleted file mode 100644
index a4c3083..0000000
--- a/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/test
-test_src := test.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/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/Android.mk b/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/Android.mk
deleted file mode 100644
index c2e3b08..0000000
--- a/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/test
-test_src := test.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/iterators/predef.iterators/insert.iterators/insert.iterator/Android.mk b/test/iterators/predef.iterators/insert.iterators/insert.iterator/Android.mk
deleted file mode 100644
index f3a74ec..0000000
--- a/test/iterators/predef.iterators/insert.iterators/insert.iterator/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/insert.iterators/insert.iterator/Android.mk
-
-test_name := iterators/predef.iterators/insert.iterators/insert.iterator/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/iterators/predef.iterators/move.iterators/Android.mk b/test/iterators/predef.iterators/move.iterators/Android.mk
deleted file mode 100644
index ffe0dfd..0000000
--- a/test/iterators/predef.iterators/move.iterators/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/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/iterators/predef.iterators/move.iterators/move.iter.ops/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/Android.mk
deleted file mode 100644
index b16dd1c..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/Android.mk
deleted file mode 100644
index 8f20743..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator
-test_src := make_move_iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus
-test_src := minus.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/Android.mk
deleted file mode 100644
index 45ee6e2..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type
-test_src := difference_type.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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/Android.mk
deleted file mode 100644
index 20c8a5d..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type
-test_src := difference_type.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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/Android.mk
deleted file mode 100644
index cb73104..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type
-test_src := difference_type.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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/Android.mk
deleted file mode 100644
index 22262c6..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type
-test_src := difference_type.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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/Android.mk
deleted file mode 100644
index 30d3280..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte
-test_src := op_lte.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq
-test_src := op_eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq
-test_src := op_neq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt
-test_src := op_gt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt
-test_src := op_lt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte
-test_src := op_gte.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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/Android.mk
deleted file mode 100644
index 3c5994c..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert
-test_src := convert.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter
-test_src := iter.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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.conv/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.conv/Android.mk
deleted file mode 100644
index 0adb500..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.conv/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.conv/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.conv/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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/Android.mk
deleted file mode 100644
index 60c639a..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post
-test_src := post.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre
-test_src := pre.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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/Android.mk
deleted file mode 100644
index 17ad737..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post
-test_src := post.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre
-test_src := pre.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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/Android.mk
deleted file mode 100644
index 5433435..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type
-test_src := difference_type.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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.ref/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.ref/Android.mk
deleted file mode 100644
index d78962d..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.ref/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.ref/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.ref/op_arrow
-test_src := op_arrow.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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.star/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.star/Android.mk
deleted file mode 100644
index 08689b8..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.star/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.star/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.star/op_star
-test_src := op_star.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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/Android.mk
deleted file mode 100644
index 5b236b5..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator
-test_src := move_iterator.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/iterators/predef.iterators/move.iterators/move.iter.requirements/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iter.requirements/Android.mk
deleted file mode 100644
index 5a3c063..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iter.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iter.requirements/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iter.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/iterators/predef.iterators/move.iterators/move.iterator/Android.mk b/test/iterators/predef.iterators/move.iterators/move.iterator/Android.mk
deleted file mode 100644
index 825ced3..0000000
--- a/test/iterators/predef.iterators/move.iterators/move.iterator/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/move.iterators/move.iterator/Android.mk
-
-test_name := iterators/predef.iterators/move.iterators/move.iterator/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/iterators/predef.iterators/reverse.iterators/Android.mk b/test/iterators/predef.iterators/reverse.iterators/Android.mk
deleted file mode 100644
index dcf1264..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/Android.mk
deleted file mode 100644
index 35df73f..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/Android.mk
deleted file mode 100644
index aba9410..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter
-test_src := iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator
-test_src := reverse_iterator.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.conv/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.conv/Android.mk
deleted file mode 100644
index 78e0cdf..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.conv/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.conv/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.conv/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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.make/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.make/Android.mk
deleted file mode 100644
index 0deb5ae..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.make/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.make/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.make/make_reverse_iterator
-test_src := make_reverse_iterator.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op\041=/Android.mk" "b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op\041=/Android.mk"
deleted file mode 100644
index 8f74718..0000000
--- "a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op\041=/Android.mk"
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op!=/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op!=/test
-test_src := test.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/Android.mk
deleted file mode 100644
index dfb4e9c..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post
-test_src := post.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre
-test_src := pre.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/Android.mk
deleted file mode 100644
index dba02b8..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type
-test_src := difference_type.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/Android.mk
deleted file mode 100644
index a1e5469..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type
-test_src := difference_type.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/Android.mk
deleted file mode 100644
index d759a5f..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post
-test_src := post.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre
-test_src := pre.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/Android.mk
deleted file mode 100644
index e109314..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type
-test_src := difference_type.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/Android.mk
deleted file mode 100644
index 90573d1..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type
-test_src := difference_type.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op.star/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op.star/Android.mk
deleted file mode 100644
index b488098..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op.star/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op.star/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op.star/op_star
-test_src := op_star.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/Android.mk
deleted file mode 100644
index ccc05b4..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator
-test_src := reverse_iterator.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/Android.mk
deleted file mode 100644
index 1245c24..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test
-test_src := test.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/Android.mk
deleted file mode 100644
index 822f3ac..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test
-test_src := test.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/Android.mk
deleted file mode 100644
index 09f7f0a..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test
-test_src := test.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/Android.mk
deleted file mode 100644
index 212bf46..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test
-test_src := test.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/Android.mk
deleted file mode 100644
index 005b779..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type
-test_src := difference_type.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/Android.mk
deleted file mode 100644
index 2562eec..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test
-test_src := test.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/Android.mk
deleted file mode 100644
index 5339670..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test
-test_src := test.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opref/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opref/Android.mk
deleted file mode 100644
index a7820ef..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opref/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opref/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opref/op_arrow
-test_src := op_arrow.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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/Android.mk
deleted file mode 100644
index 3da7ab7..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type
-test_src := difference_type.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/iterators/predef.iterators/reverse.iterators/reverse.iter.requirements/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.requirements/Android.mk
deleted file mode 100644
index c2a64aa..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iter.requirements/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iter.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/iterators/predef.iterators/reverse.iterators/reverse.iterator/Android.mk b/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/Android.mk
deleted file mode 100644
index bc7132b..0000000
--- a/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/predef.iterators/reverse.iterators/reverse.iterator/Android.mk
-
-test_name := iterators/predef.iterators/reverse.iterators/reverse.iterator/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/iterators/stream.iterators/Android.mk b/test/iterators/stream.iterators/Android.mk
deleted file mode 100644
index 3c47536..0000000
--- a/test/iterators/stream.iterators/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/stream.iterators/Android.mk
-
-test_name := iterators/stream.iterators/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/iterators/stream.iterators/istream.iterator/Android.mk b/test/iterators/stream.iterators/istream.iterator/Android.mk
deleted file mode 100644
index 08891f0..0000000
--- a/test/iterators/stream.iterators/istream.iterator/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/stream.iterators/istream.iterator/Android.mk
-
-test_name := iterators/stream.iterators/istream.iterator/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/iterators/stream.iterators/istream.iterator/istream.iterator.cons/Android.mk b/test/iterators/stream.iterators/istream.iterator/istream.iterator.cons/Android.mk
deleted file mode 100644
index 03b5cf1..0000000
--- a/test/iterators/stream.iterators/istream.iterator/istream.iterator.cons/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/iterators/stream.iterators/istream.iterator/istream.iterator.cons/Android.mk
-
-test_name := iterators/stream.iterators/istream.iterator/istream.iterator.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/istream.iterator/istream.iterator.cons/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/istream.iterator/istream.iterator.cons/istream
-test_src := istream.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/iterators/stream.iterators/istream.iterator/istream.iterator.ops/Android.mk b/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/Android.mk
deleted file mode 100644
index fb6b63b..0000000
--- a/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/iterators/stream.iterators/istream.iterator/istream.iterator.ops/Android.mk
-
-test_name := iterators/stream.iterators/istream.iterator/istream.iterator.ops/post_increment
-test_src := post_increment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/istream.iterator/istream.iterator.ops/pre_increment
-test_src := pre_increment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/istream.iterator/istream.iterator.ops/dereference
-test_src := dereference.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/istream.iterator/istream.iterator.ops/arrow
-test_src := arrow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/istream.iterator/istream.iterator.ops/equal
-test_src := equal.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/iterators/stream.iterators/istreambuf.iterator/Android.mk b/test/iterators/stream.iterators/istreambuf.iterator/Android.mk
deleted file mode 100644
index b49ae9a..0000000
--- a/test/iterators/stream.iterators/istreambuf.iterator/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/stream.iterators/istreambuf.iterator/Android.mk
-
-test_name := iterators/stream.iterators/istreambuf.iterator/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/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/Android.mk b/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/Android.mk
deleted file mode 100644
index a0861bd..0000000
--- a/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/Android.mk
-
-test_name := iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/streambuf
-test_src := streambuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/proxy
-test_src := proxy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/istream
-test_src := istream.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/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_equal/Android.mk b/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_equal/Android.mk
deleted file mode 100644
index 67e853d..0000000
--- a/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_equal/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_equal/Android.mk
-
-test_name := iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_equal/equal
-test_src := equal.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/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op\041=/Android.mk" "b/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op\041=/Android.mk"
deleted file mode 100644
index a928e12..0000000
--- "a/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op\041=/Android.mk"
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op!=/Android.mk
-
-test_name := iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op!=/not_equal
-test_src := not_equal.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/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op++/Android.mk b/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op++/Android.mk
deleted file mode 100644
index 7abab18..0000000
--- a/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op++/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op++/Android.mk
-
-test_name := iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op++/dereference
-test_src := dereference.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/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op==/Android.mk b/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op==/Android.mk
deleted file mode 100644
index d69b1a1..0000000
--- a/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op==/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op==/Android.mk
-
-test_name := iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op==/equal
-test_src := equal.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/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/Android.mk b/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/Android.mk
deleted file mode 100644
index dcfec31..0000000
--- a/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/Android.mk
-
-test_name := iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/post_increment
-test_src := post_increment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/pre_increment
-test_src := pre_increment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/arrow
-test_src := arrow.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/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_proxy/Android.mk b/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_proxy/Android.mk
deleted file mode 100644
index d7a1cf4..0000000
--- a/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_proxy/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_proxy/Android.mk
-
-test_name := iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_proxy/proxy
-test_src := proxy.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/iterators/stream.iterators/iterator.range/Android.mk b/test/iterators/stream.iterators/iterator.range/Android.mk
deleted file mode 100644
index 3265115..0000000
--- a/test/iterators/stream.iterators/iterator.range/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/iterators/stream.iterators/iterator.range/Android.mk
-
-test_name := iterators/stream.iterators/iterator.range/begin_array
-test_src := begin_array.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/iterator.range/begin_const
-test_src := begin_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/iterator.range/end_non_const
-test_src := end_non_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/iterator.range/end_array
-test_src := end_array.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/iterator.range/end_const
-test_src := end_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/iterator.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/iterators/stream.iterators/ostream.iterator/Android.mk b/test/iterators/stream.iterators/ostream.iterator/Android.mk
deleted file mode 100644
index 87f7ff7..0000000
--- a/test/iterators/stream.iterators/ostream.iterator/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/stream.iterators/ostream.iterator/Android.mk
-
-test_name := iterators/stream.iterators/ostream.iterator/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/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/Android.mk b/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/Android.mk
deleted file mode 100644
index 907d2bf..0000000
--- a/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/Android.mk
-
-test_name := iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/ostream
-test_src := ostream.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/ostream_delem
-test_src := ostream_delem.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/copy
-test_src := 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/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/Android.mk b/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/Android.mk
deleted file mode 100644
index 658c64d..0000000
--- a/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/Android.mk
-
-test_name := iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/dereference
-test_src := dereference.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/assign_t
-test_src := assign_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/increment
-test_src := increment.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/iterators/stream.iterators/ostreambuf.iterator/Android.mk b/test/iterators/stream.iterators/ostreambuf.iterator/Android.mk
deleted file mode 100644
index 039653b..0000000
--- a/test/iterators/stream.iterators/ostreambuf.iterator/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/iterators/stream.iterators/ostreambuf.iterator/Android.mk
-
-test_name := iterators/stream.iterators/ostreambuf.iterator/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/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.cons/Android.mk b/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.cons/Android.mk
deleted file mode 100644
index 9dc3178..0000000
--- a/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.cons/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.cons/Android.mk
-
-test_name := iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.cons/ostream
-test_src := ostream.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.cons/streambuf
-test_src := streambuf.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/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/Android.mk b/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/Android.mk
deleted file mode 100644
index f978c62..0000000
--- a/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/Android.mk
-
-test_name := iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/assign_c
-test_src := assign_c.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/increment
-test_src := increment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/failed
-test_src := failed.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/deref
-test_src := deref.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/language.support/Android.mk b/test/language.support/Android.mk
deleted file mode 100644
index 468dbe2..0000000
--- a/test/language.support/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/Android.mk
-
-test_name := language.support/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/language.support/cstdint/Android.mk b/test/language.support/cstdint/Android.mk
deleted file mode 100644
index b1d4023..0000000
--- a/test/language.support/cstdint/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/cstdint/Android.mk
-
-test_name := language.support/cstdint/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/language.support/cstdint/cstdint.syn/Android.mk b/test/language.support/cstdint/cstdint.syn/Android.mk
deleted file mode 100644
index 88f3c17..0000000
--- a/test/language.support/cstdint/cstdint.syn/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/cstdint/cstdint.syn/Android.mk
-
-test_name := language.support/cstdint/cstdint.syn/cstdint
-test_src := cstdint.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/language.support/support.dynamic/Android.mk b/test/language.support/support.dynamic/Android.mk
deleted file mode 100644
index 7f67e1e..0000000
--- a/test/language.support/support.dynamic/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.dynamic/Android.mk
-
-test_name := language.support/support.dynamic/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/language.support/support.dynamic/alloc.errors/Android.mk b/test/language.support/support.dynamic/alloc.errors/Android.mk
deleted file mode 100644
index 91830c6..0000000
--- a/test/language.support/support.dynamic/alloc.errors/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.dynamic/alloc.errors/Android.mk
-
-test_name := language.support/support.dynamic/alloc.errors/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/language.support/support.dynamic/alloc.errors/bad.alloc/Android.mk b/test/language.support/support.dynamic/alloc.errors/bad.alloc/Android.mk
deleted file mode 100644
index bbf8070..0000000
--- a/test/language.support/support.dynamic/alloc.errors/bad.alloc/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.dynamic/alloc.errors/bad.alloc/Android.mk
-
-test_name := language.support/support.dynamic/alloc.errors/bad.alloc/bad_alloc
-test_src := bad_alloc.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/language.support/support.dynamic/alloc.errors/new.badlength/Android.mk b/test/language.support/support.dynamic/alloc.errors/new.badlength/Android.mk
deleted file mode 100644
index 1c753e1..0000000
--- a/test/language.support/support.dynamic/alloc.errors/new.badlength/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/language.support/support.dynamic/alloc.errors/new.badlength/Android.mk
-
-test_name := language.support/support.dynamic/alloc.errors/new.badlength/bad_array_new_length
-test_src := bad_array_new_length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.dynamic/alloc.errors/new.badlength/bad_array_length
-test_src := bad_array_length.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/language.support/support.dynamic/alloc.errors/new.handler/Android.mk b/test/language.support/support.dynamic/alloc.errors/new.handler/Android.mk
deleted file mode 100644
index 41405cf..0000000
--- a/test/language.support/support.dynamic/alloc.errors/new.handler/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.dynamic/alloc.errors/new.handler/Android.mk
-
-test_name := language.support/support.dynamic/alloc.errors/new.handler/new_handler
-test_src := new_handler.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/language.support/support.dynamic/alloc.errors/set.new.handler/Android.mk b/test/language.support/support.dynamic/alloc.errors/set.new.handler/Android.mk
deleted file mode 100644
index 263d841..0000000
--- a/test/language.support/support.dynamic/alloc.errors/set.new.handler/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/language.support/support.dynamic/alloc.errors/set.new.handler/Android.mk
-
-test_name := language.support/support.dynamic/alloc.errors/set.new.handler/set_new_handler
-test_src := set_new_handler.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.dynamic/alloc.errors/set.new.handler/get_new_handler
-test_src := get_new_handler.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/language.support/support.dynamic/new.delete/Android.mk b/test/language.support/support.dynamic/new.delete/Android.mk
deleted file mode 100644
index aca1e1b..0000000
--- a/test/language.support/support.dynamic/new.delete/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.dynamic/new.delete/Android.mk
-
-test_name := language.support/support.dynamic/new.delete/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/language.support/support.dynamic/new.delete/new.delete.array/Android.mk b/test/language.support/support.dynamic/new.delete/new.delete.array/Android.mk
deleted file mode 100644
index f170126..0000000
--- a/test/language.support/support.dynamic/new.delete/new.delete.array/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/language.support/support.dynamic/new.delete/new.delete.array/Android.mk
-
-test_name := language.support/support.dynamic/new.delete/new.delete.array/new_array_replace
-test_src := new_array_replace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.dynamic/new.delete/new.delete.array/new_array
-test_src := new_array.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace
-test_src := new_array_nothrow_replace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow
-test_src := new_array_nothrow.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/language.support/support.dynamic/new.delete/new.delete.dataraces/Android.mk b/test/language.support/support.dynamic/new.delete/new.delete.dataraces/Android.mk
deleted file mode 100644
index ccad8f1..0000000
--- a/test/language.support/support.dynamic/new.delete/new.delete.dataraces/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.dynamic/new.delete/new.delete.dataraces/Android.mk
-
-test_name := language.support/support.dynamic/new.delete/new.delete.dataraces/not_testable
-test_src := not_testable.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/language.support/support.dynamic/new.delete/new.delete.placement/Android.mk b/test/language.support/support.dynamic/new.delete/new.delete.placement/Android.mk
deleted file mode 100644
index 6ba0838..0000000
--- a/test/language.support/support.dynamic/new.delete/new.delete.placement/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/language.support/support.dynamic/new.delete/new.delete.placement/Android.mk
-
-test_name := language.support/support.dynamic/new.delete/new.delete.placement/new_array
-test_src := new_array.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.dynamic/new.delete/new.delete.placement/new
-test_src := new.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/language.support/support.dynamic/new.delete/new.delete.single/Android.mk b/test/language.support/support.dynamic/new.delete/new.delete.single/Android.mk
deleted file mode 100644
index f503643..0000000
--- a/test/language.support/support.dynamic/new.delete/new.delete.single/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/language.support/support.dynamic/new.delete/new.delete.single/Android.mk
-
-test_name := language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace
-test_src := new_nothrow_replace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.dynamic/new.delete/new.delete.single/new
-test_src := new.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.dynamic/new.delete/new.delete.single/new_nothrow
-test_src := new_nothrow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.dynamic/new.delete/new.delete.single/new_replace
-test_src := new_replace.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/language.support/support.exception/Android.mk b/test/language.support/support.exception/Android.mk
deleted file mode 100644
index 2d014df..0000000
--- a/test/language.support/support.exception/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.exception/Android.mk
-
-test_name := language.support/support.exception/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/language.support/support.exception/bad.exception/Android.mk b/test/language.support/support.exception/bad.exception/Android.mk
deleted file mode 100644
index 6a91221..0000000
--- a/test/language.support/support.exception/bad.exception/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.exception/bad.exception/Android.mk
-
-test_name := language.support/support.exception/bad.exception/bad_exception
-test_src := bad_exception.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/language.support/support.exception/except.nested/Android.mk b/test/language.support/support.exception/except.nested/Android.mk
deleted file mode 100644
index c41a93b..0000000
--- a/test/language.support/support.exception/except.nested/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/language.support/support.exception/except.nested/Android.mk
-
-test_name := language.support/support.exception/except.nested/rethrow_nested
-test_src := rethrow_nested.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.exception/except.nested/ctor_copy
-test_src := ctor_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.exception/except.nested/assign
-test_src := assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.exception/except.nested/rethrow_if_nested
-test_src := rethrow_if_nested.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.exception/except.nested/throw_with_nested
-test_src := throw_with_nested.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.exception/except.nested/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/language.support/support.exception/exception.terminate/Android.mk b/test/language.support/support.exception/exception.terminate/Android.mk
deleted file mode 100644
index 4e3f831..0000000
--- a/test/language.support/support.exception/exception.terminate/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.exception/exception.terminate/Android.mk
-
-test_name := language.support/support.exception/exception.terminate/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/language.support/support.exception/exception.terminate/set.terminate/Android.mk b/test/language.support/support.exception/exception.terminate/set.terminate/Android.mk
deleted file mode 100644
index d55ad72..0000000
--- a/test/language.support/support.exception/exception.terminate/set.terminate/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/language.support/support.exception/exception.terminate/set.terminate/Android.mk
-
-test_name := language.support/support.exception/exception.terminate/set.terminate/set_terminate
-test_src := set_terminate.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.exception/exception.terminate/set.terminate/get_terminate
-test_src := get_terminate.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/language.support/support.exception/exception.terminate/terminate.handler/Android.mk b/test/language.support/support.exception/exception.terminate/terminate.handler/Android.mk
deleted file mode 100644
index 35a0759..0000000
--- a/test/language.support/support.exception/exception.terminate/terminate.handler/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.exception/exception.terminate/terminate.handler/Android.mk
-
-test_name := language.support/support.exception/exception.terminate/terminate.handler/terminate_handler
-test_src := terminate_handler.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/language.support/support.exception/exception.terminate/terminate/Android.mk b/test/language.support/support.exception/exception.terminate/terminate/Android.mk
deleted file mode 100644
index 126986f..0000000
--- a/test/language.support/support.exception/exception.terminate/terminate/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.exception/exception.terminate/terminate/Android.mk
-
-test_name := language.support/support.exception/exception.terminate/terminate/terminate
-test_src := terminate.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/language.support/support.exception/exception/Android.mk b/test/language.support/support.exception/exception/Android.mk
deleted file mode 100644
index 56951c3..0000000
--- a/test/language.support/support.exception/exception/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.exception/exception/Android.mk
-
-test_name := language.support/support.exception/exception/exception
-test_src := exception.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/language.support/support.exception/propagation/Android.mk b/test/language.support/support.exception/propagation/Android.mk
deleted file mode 100644
index 03e0fce..0000000
--- a/test/language.support/support.exception/propagation/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/language.support/support.exception/propagation/Android.mk
-
-test_name := language.support/support.exception/propagation/current_exception
-test_src := current_exception.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.exception/propagation/exception_ptr
-test_src := exception_ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.exception/propagation/make_exception_ptr
-test_src := make_exception_ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.exception/propagation/rethrow_exception
-test_src := rethrow_exception.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/language.support/support.exception/uncaught/Android.mk b/test/language.support/support.exception/uncaught/Android.mk
deleted file mode 100644
index d500db0..0000000
--- a/test/language.support/support.exception/uncaught/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.exception/uncaught/Android.mk
-
-test_name := language.support/support.exception/uncaught/uncaught_exception
-test_src := uncaught_exception.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/language.support/support.general/Android.mk b/test/language.support/support.general/Android.mk
deleted file mode 100644
index 9331912..0000000
--- a/test/language.support/support.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.general/Android.mk
-
-test_name := language.support/support.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/language.support/support.initlist/Android.mk b/test/language.support/support.initlist/Android.mk
deleted file mode 100644
index 4bb3760..0000000
--- a/test/language.support/support.initlist/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/language.support/support.initlist/Android.mk
-
-test_name := language.support/support.initlist/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.initlist/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/language.support/support.initlist/support.initlist.access/Android.mk b/test/language.support/support.initlist/support.initlist.access/Android.mk
deleted file mode 100644
index 3cdaa34..0000000
--- a/test/language.support/support.initlist/support.initlist.access/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.initlist/support.initlist.access/Android.mk
-
-test_name := language.support/support.initlist/support.initlist.access/access
-test_src := 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/language.support/support.initlist/support.initlist.cons/Android.mk b/test/language.support/support.initlist/support.initlist.cons/Android.mk
deleted file mode 100644
index c80cc9b..0000000
--- a/test/language.support/support.initlist/support.initlist.cons/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.initlist/support.initlist.cons/Android.mk
-
-test_name := language.support/support.initlist/support.initlist.cons/default
-test_src := 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/language.support/support.initlist/support.initlist.range/Android.mk b/test/language.support/support.initlist/support.initlist.range/Android.mk
deleted file mode 100644
index ae61cdb..0000000
--- a/test/language.support/support.initlist/support.initlist.range/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.initlist/support.initlist.range/Android.mk
-
-test_name := language.support/support.initlist/support.initlist.range/begin_end
-test_src := begin_end.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/language.support/support.limits/Android.mk b/test/language.support/support.limits/Android.mk
deleted file mode 100644
index e70a349..0000000
--- a/test/language.support/support.limits/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.limits/Android.mk
-
-test_name := language.support/support.limits/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/language.support/support.limits/c.limits/Android.mk b/test/language.support/support.limits/c.limits/Android.mk
deleted file mode 100644
index 8bd079f..0000000
--- a/test/language.support/support.limits/c.limits/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/language.support/support.limits/c.limits/Android.mk
-
-test_name := language.support/support.limits/c.limits/climits
-test_src := climits.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/c.limits/cfloat
-test_src := cfloat.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/c.limits/version_cfloat
-test_src := version_cfloat.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/c.limits/version_climits
-test_src := version_climits.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/language.support/support.limits/limits/Android.mk b/test/language.support/support.limits/limits/Android.mk
deleted file mode 100644
index 0ad3f56..0000000
--- a/test/language.support/support.limits/limits/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/language.support/support.limits/limits/Android.mk
-
-test_name := language.support/support.limits/limits/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/is_specialized
-test_src := is_specialized.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/language.support/support.limits/limits/denorm.style/Android.mk b/test/language.support/support.limits/limits/denorm.style/Android.mk
deleted file mode 100644
index 741e4c0..0000000
--- a/test/language.support/support.limits/limits/denorm.style/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.limits/limits/denorm.style/Android.mk
-
-test_name := language.support/support.limits/limits/denorm.style/check_values
-test_src := check_values.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/language.support/support.limits/limits/numeric.limits.members/Android.mk b/test/language.support/support.limits/limits/numeric.limits.members/Android.mk
deleted file mode 100644
index 3de24b5..0000000
--- a/test/language.support/support.limits/limits/numeric.limits.members/Android.mk
+++ /dev/null
@@ -1,147 +0,0 @@
-#
-# 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/language.support/support.limits/limits/numeric.limits.members/Android.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/const_data_members
-test_src := const_data_members.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/epsilon
-test_src := epsilon.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/has_denorm_loss
-test_src := has_denorm_loss.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/max_exponent10
-test_src := max_exponent10.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/round_style
-test_src := round_style.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/signaling_NaN
-test_src := signaling_NaN.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/lowest
-test_src := lowest.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/is_iec559
-test_src := is_iec559.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/is_exact
-test_src := is_exact.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/traps
-test_src := traps.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/is_integer
-test_src := is_integer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/is_signed
-test_src := is_signed.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/min
-test_src := min.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/tinyness_before
-test_src := tinyness_before.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN
-test_src := has_signaling_NaN.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/has_infinity
-test_src := has_infinity.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/digits
-test_src := digits.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/radix
-test_src := radix.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/max_digits10
-test_src := max_digits10.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/round_error
-test_src := round_error.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/digits10
-test_src := digits10.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/is_modulo
-test_src := is_modulo.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/max_exponent
-test_src := max_exponent.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/has_denorm
-test_src := has_denorm.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/is_bounded
-test_src := is_bounded.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/min_exponent
-test_src := min_exponent.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/max
-test_src := max.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/quiet_NaN
-test_src := quiet_NaN.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/min_exponent10
-test_src := min_exponent10.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/infinity
-test_src := infinity.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/denorm_min
-test_src := denorm_min.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN
-test_src := has_quiet_NaN.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/language.support/support.limits/limits/numeric.limits/Android.mk b/test/language.support/support.limits/limits/numeric.limits/Android.mk
deleted file mode 100644
index dd163f2..0000000
--- a/test/language.support/support.limits/limits/numeric.limits/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.limits/limits/numeric.limits/Android.mk
-
-test_name := language.support/support.limits/limits/numeric.limits/default
-test_src := 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/language.support/support.limits/limits/numeric.special/Android.mk b/test/language.support/support.limits/limits/numeric.special/Android.mk
deleted file mode 100644
index 4e15662..0000000
--- a/test/language.support/support.limits/limits/numeric.special/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.limits/limits/numeric.special/Android.mk
-
-test_name := language.support/support.limits/limits/numeric.special/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/language.support/support.limits/limits/round.style/Android.mk b/test/language.support/support.limits/limits/round.style/Android.mk
deleted file mode 100644
index a2143ec..0000000
--- a/test/language.support/support.limits/limits/round.style/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.limits/limits/round.style/Android.mk
-
-test_name := language.support/support.limits/limits/round.style/check_values
-test_src := check_values.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/language.support/support.rtti/Android.mk b/test/language.support/support.rtti/Android.mk
deleted file mode 100644
index 6f08635..0000000
--- a/test/language.support/support.rtti/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.rtti/Android.mk
-
-test_name := language.support/support.rtti/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/language.support/support.rtti/bad.cast/Android.mk b/test/language.support/support.rtti/bad.cast/Android.mk
deleted file mode 100644
index 5555bab..0000000
--- a/test/language.support/support.rtti/bad.cast/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.rtti/bad.cast/Android.mk
-
-test_name := language.support/support.rtti/bad.cast/bad_cast
-test_src := bad_cast.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/language.support/support.rtti/bad.typeid/Android.mk b/test/language.support/support.rtti/bad.typeid/Android.mk
deleted file mode 100644
index be5e616..0000000
--- a/test/language.support/support.rtti/bad.typeid/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/language.support/support.rtti/bad.typeid/Android.mk
-
-test_name := language.support/support.rtti/bad.typeid/bad_typeid
-test_src := bad_typeid.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/language.support/support.rtti/type.info/Android.mk b/test/language.support/support.rtti/type.info/Android.mk
deleted file mode 100644
index 222bc9c..0000000
--- a/test/language.support/support.rtti/type.info/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/language.support/support.rtti/type.info/Android.mk
-
-test_name := language.support/support.rtti/type.info/type_info_hash
-test_src := type_info_hash.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.rtti/type.info/type_info
-test_src := type_info.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/language.support/support.runtime/Android.mk b/test/language.support/support.runtime/Android.mk
deleted file mode 100644
index f8525bd..0000000
--- a/test/language.support/support.runtime/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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/language.support/support.runtime/Android.mk
-
-test_name := language.support/support.runtime/cstdbool
-test_src := cstdbool.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.runtime/cstdarg
-test_src := cstdarg.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.runtime/version_csetjmp
-test_src := version_csetjmp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.runtime/version_ctime
-test_src := version_ctime.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.runtime/version_cstdlib
-test_src := version_cstdlib.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.runtime/ctime
-test_src := ctime.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.runtime/version_csignal
-test_src := version_csignal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.runtime/version_cstdarg
-test_src := version_cstdarg.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.runtime/csetjmp
-test_src := csetjmp.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.runtime/version_cstdbool
-test_src := version_cstdbool.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.runtime/csignal
-test_src := csignal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.runtime/cstdlib
-test_src := cstdlib.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/language.support/support.start.term/Android.mk b/test/language.support/support.start.term/Android.mk
deleted file mode 100644
index 1b7fdad..0000000
--- a/test/language.support/support.start.term/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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/language.support/support.start.term/Android.mk
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/test/language.support/support.types/Android.mk b/test/language.support/support.types/Android.mk
deleted file mode 100644
index d8fe88e..0000000
--- a/test/language.support/support.types/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/language.support/support.types/Android.mk
-
-test_name := language.support/support.types/null
-test_src := null.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.types/size_t
-test_src := size_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.types/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.types/ptrdiff_t
-test_src := ptrdiff_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.types/offsetof
-test_src := offsetof.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := language.support/support.types/nullptr_t
-test_src := nullptr_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/test/localization/Android.mk b/test/localization/Android.mk
deleted file mode 100644
index 4011ca7..0000000
--- a/test/localization/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/Android.mk
-
-test_name := localization/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/localization/c.locales/Android.mk b/test/localization/c.locales/Android.mk
deleted file mode 100644
index 02b7879..0000000
--- a/test/localization/c.locales/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/c.locales/Android.mk
-
-test_name := localization/c.locales/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/c.locales/clocale
-test_src := clocale.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/localization/locale.categories/Android.mk b/test/localization/locale.categories/Android.mk
deleted file mode 100644
index f26ae39..0000000
--- a/test/localization/locale.categories/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/Android.mk
-
-test_name := localization/locale.categories/__scan_keyword
-test_src := __scan_keyword.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/localization/locale.categories/category.collate/Android.mk b/test/localization/locale.categories/category.collate/Android.mk
deleted file mode 100644
index 0ab1314..0000000
--- a/test/localization/locale.categories/category.collate/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.collate/Android.mk
-
-test_name := localization/locale.categories/category.collate/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/localization/locale.categories/category.collate/locale.collate.byname/Android.mk b/test/localization/locale.categories/category.collate/locale.collate.byname/Android.mk
deleted file mode 100644
index 69d4b4e..0000000
--- a/test/localization/locale.categories/category.collate/locale.collate.byname/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/localization/locale.categories/category.collate/locale.collate.byname/Android.mk
-
-test_name := localization/locale.categories/category.collate/locale.collate.byname/compare
-test_src := compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.collate/locale.collate.byname/transform
-test_src := transform.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.collate/locale.collate.byname/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.collate/locale.collate.byname/hash
-test_src := hash.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/localization/locale.categories/category.collate/locale.collate/Android.mk b/test/localization/locale.categories/category.collate/locale.collate/Android.mk
deleted file mode 100644
index 9b7f8b5..0000000
--- a/test/localization/locale.categories/category.collate/locale.collate/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/locale.categories/category.collate/locale.collate/Android.mk
-
-test_name := localization/locale.categories/category.collate/locale.collate/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.collate/locale.collate/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/localization/locale.categories/category.collate/locale.collate/locale.collate.members/Android.mk b/test/localization/locale.categories/category.collate/locale.collate/locale.collate.members/Android.mk
deleted file mode 100644
index 993bc31..0000000
--- a/test/localization/locale.categories/category.collate/locale.collate/locale.collate.members/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/localization/locale.categories/category.collate/locale.collate/locale.collate.members/Android.mk
-
-test_name := localization/locale.categories/category.collate/locale.collate/locale.collate.members/compare
-test_src := compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.collate/locale.collate/locale.collate.members/transform
-test_src := transform.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.collate/locale.collate/locale.collate.members/hash
-test_src := hash.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/localization/locale.categories/category.collate/locale.collate/locale.collate.virtuals/Android.mk b/test/localization/locale.categories/category.collate/locale.collate/locale.collate.virtuals/Android.mk
deleted file mode 100644
index e1d5659..0000000
--- a/test/localization/locale.categories/category.collate/locale.collate/locale.collate.virtuals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.collate/locale.collate/locale.collate.virtuals/Android.mk
-
-test_name := localization/locale.categories/category.collate/locale.collate/locale.collate.virtuals/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/localization/locale.categories/category.ctype/Android.mk b/test/localization/locale.categories/category.ctype/Android.mk
deleted file mode 100644
index 3ae48f8..0000000
--- a/test/localization/locale.categories/category.ctype/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.ctype/Android.mk
-
-test_name := localization/locale.categories/category.ctype/ctype_base
-test_src := ctype_base.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/localization/locale.categories/category.ctype/facet.ctype.special/Android.mk b/test/localization/locale.categories/category.ctype/facet.ctype.special/Android.mk
deleted file mode 100644
index a6b5d13..0000000
--- a/test/localization/locale.categories/category.ctype/facet.ctype.special/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.ctype/facet.ctype.special/Android.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/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/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/Android.mk b/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/Android.mk
deleted file mode 100644
index 472465d..0000000
--- a/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/Android.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/dtor
-test_src := dtor.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/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/Android.mk b/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/Android.mk
deleted file mode 100644
index c9219c8..0000000
--- a/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/Android.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# 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/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/Android.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/widen_many
-test_src := widen_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/scan_is
-test_src := scan_is.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/narrow_many
-test_src := narrow_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/scan_not
-test_src := scan_not.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/toupper_many
-test_src := toupper_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/toupper_1
-test_src := toupper_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/widen_1
-test_src := widen_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/tolower_1
-test_src := tolower_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/is_many
-test_src := is_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/is_1
-test_src := is_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/tolower_many
-test_src := tolower_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/narrow_1
-test_src := narrow_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/ctor
-test_src := ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/table
-test_src := table.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/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.statics/Android.mk b/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.statics/Android.mk
deleted file mode 100644
index 273b8d5..0000000
--- a/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.statics/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.statics/Android.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.statics/classic_table
-test_src := classic_table.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/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.virtuals/Android.mk b/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.virtuals/Android.mk
deleted file mode 100644
index 8ad32ab..0000000
--- a/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.virtuals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.virtuals/Android.mk
-
-test_name := localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.virtuals/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/localization/locale.categories/category.ctype/locale.codecvt.byname/Android.mk b/test/localization/locale.categories/category.ctype/locale.codecvt.byname/Android.mk
deleted file mode 100644
index 4394a7a..0000000
--- a/test/localization/locale.categories/category.ctype/locale.codecvt.byname/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/localization/locale.categories/category.ctype/locale.codecvt.byname/Android.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char32_t
-test_src := ctor_char32_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char16_t
-test_src := ctor_char16_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char
-test_src := ctor_char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t
-test_src := ctor_wchar_t.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/localization/locale.categories/category.ctype/locale.codecvt/Android.mk b/test/localization/locale.categories/category.ctype/locale.codecvt/Android.mk
deleted file mode 100644
index 50c477f..0000000
--- a/test/localization/locale.categories/category.ctype/locale.codecvt/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/localization/locale.categories/category.ctype/locale.codecvt/Android.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/codecvt_base
-test_src := codecvt_base.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/types_wchar_t
-test_src := types_wchar_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/types_char32_t
-test_src := types_char32_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/types_char
-test_src := types_char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/ctor_char32_t
-test_src := ctor_char32_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/ctor_char16_t
-test_src := ctor_char16_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/ctor_char
-test_src := ctor_char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/ctor_wchar_t
-test_src := ctor_wchar_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/types_char16_t
-test_src := types_char16_t.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/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/Android.mk b/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/Android.mk
deleted file mode 100644
index f8089c0..0000000
--- a/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/Android.mk
+++ /dev/null
@@ -1,135 +0,0 @@
-#
-# 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/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/Android.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_unshift
-test_src := char_unshift.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_encoding
-test_src := char16_t_encoding.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_out
-test_src := char32_t_out.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_length
-test_src := char_length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_out
-test_src := char_out.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_always_noconv
-test_src := char16_t_always_noconv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_out
-test_src := wchar_t_out.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_length
-test_src := char16_t_length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_always_noconv
-test_src := wchar_t_always_noconv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_encoding
-test_src := wchar_t_encoding.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_max_length
-test_src := char16_t_max_length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_out
-test_src := char16_t_out.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_in
-test_src := char16_t_in.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_unshift
-test_src := wchar_t_unshift.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_unshift
-test_src := char32_t_unshift.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_max_length
-test_src := char_max_length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_length
-test_src := wchar_t_length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_length
-test_src := char32_t_length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_unshift
-test_src := char16_t_unshift.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_always_noconv
-test_src := char32_t_always_noconv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_max_length
-test_src := wchar_t_max_length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_encoding
-test_src := char_encoding.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_encoding
-test_src := char32_t_encoding.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_in
-test_src := char_in.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_always_noconv
-test_src := char_always_noconv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_max_length
-test_src := char32_t_max_length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_in
-test_src := char32_t_in.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_in
-test_src := wchar_t_in.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/utf_sanity_check
-test_src := utf_sanity_check.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/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.virtuals/Android.mk b/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.virtuals/Android.mk
deleted file mode 100644
index af496fa..0000000
--- a/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.virtuals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.virtuals/Android.mk
-
-test_name := localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.virtuals/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/localization/locale.categories/category.ctype/locale.ctype.byname/Android.mk b/test/localization/locale.categories/category.ctype/locale.ctype.byname/Android.mk
deleted file mode 100644
index a189488..0000000
--- a/test/localization/locale.categories/category.ctype/locale.ctype.byname/Android.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# 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/localization/locale.categories/category.ctype/locale.ctype.byname/Android.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype.byname/widen_many
-test_src := widen_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype.byname/scan_is
-test_src := scan_is.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype.byname/narrow_many
-test_src := narrow_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype.byname/scan_not
-test_src := scan_not.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many
-test_src := toupper_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1
-test_src := toupper_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype.byname/widen_1
-test_src := widen_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1
-test_src := tolower_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype.byname/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype.byname/is_many
-test_src := is_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype.byname/is_1
-test_src := is_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many
-test_src := tolower_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype.byname/narrow_1
-test_src := narrow_1.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/localization/locale.categories/category.ctype/locale.ctype/Android.mk b/test/localization/locale.categories/category.ctype/locale.ctype/Android.mk
deleted file mode 100644
index 0c40d5c..0000000
--- a/test/localization/locale.categories/category.ctype/locale.ctype/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/locale.categories/category.ctype/locale.ctype/Android.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/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/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/Android.mk b/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/Android.mk
deleted file mode 100644
index 5f47418..0000000
--- a/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/Android.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/widen_many
-test_src := widen_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/scan_is
-test_src := scan_is.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/narrow_many
-test_src := narrow_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/scan_not
-test_src := scan_not.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/toupper_many
-test_src := toupper_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/toupper_1
-test_src := toupper_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/widen_1
-test_src := widen_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/tolower_1
-test_src := tolower_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/is_many
-test_src := is_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/is_1
-test_src := is_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/tolower_many
-test_src := tolower_many.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/narrow_1
-test_src := narrow_1.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/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.virtuals/Android.mk b/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.virtuals/Android.mk
deleted file mode 100644
index b6d25d7..0000000
--- a/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.virtuals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.virtuals/Android.mk
-
-test_name := localization/locale.categories/category.ctype/locale.ctype/locale.ctype.virtuals/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/localization/locale.categories/category.messages/Android.mk b/test/localization/locale.categories/category.messages/Android.mk
deleted file mode 100644
index fe3f258..0000000
--- a/test/localization/locale.categories/category.messages/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.messages/Android.mk
-
-test_name := localization/locale.categories/category.messages/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/localization/locale.categories/category.messages/locale.messages.byname/Android.mk b/test/localization/locale.categories/category.messages/locale.messages.byname/Android.mk
deleted file mode 100644
index 6fd4f25..0000000
--- a/test/localization/locale.categories/category.messages/locale.messages.byname/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.messages/locale.messages.byname/Android.mk
-
-test_name := localization/locale.categories/category.messages/locale.messages.byname/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/localization/locale.categories/category.messages/locale.messages/Android.mk b/test/localization/locale.categories/category.messages/locale.messages/Android.mk
deleted file mode 100644
index 17a22ea..0000000
--- a/test/localization/locale.categories/category.messages/locale.messages/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/localization/locale.categories/category.messages/locale.messages/Android.mk
-
-test_name := localization/locale.categories/category.messages/locale.messages/messages_base
-test_src := messages_base.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.messages/locale.messages/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.messages/locale.messages/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/localization/locale.categories/category.messages/locale.messages/locale.messages.members/Android.mk b/test/localization/locale.categories/category.messages/locale.messages/locale.messages.members/Android.mk
deleted file mode 100644
index cb41349..0000000
--- a/test/localization/locale.categories/category.messages/locale.messages/locale.messages.members/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.messages/locale.messages/locale.messages.members/Android.mk
-
-test_name := localization/locale.categories/category.messages/locale.messages/locale.messages.members/not_testable
-test_src := not_testable.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/localization/locale.categories/category.messages/locale.messages/locale.messages.virtuals/Android.mk b/test/localization/locale.categories/category.messages/locale.messages/locale.messages.virtuals/Android.mk
deleted file mode 100644
index 545ebc1..0000000
--- a/test/localization/locale.categories/category.messages/locale.messages/locale.messages.virtuals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.messages/locale.messages/locale.messages.virtuals/Android.mk
-
-test_name := localization/locale.categories/category.messages/locale.messages/locale.messages.virtuals/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/localization/locale.categories/category.monetary/Android.mk b/test/localization/locale.categories/category.monetary/Android.mk
deleted file mode 100644
index 2148357..0000000
--- a/test/localization/locale.categories/category.monetary/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.monetary/Android.mk
-
-test_name := localization/locale.categories/category.monetary/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/localization/locale.categories/category.monetary/locale.money.get/Android.mk b/test/localization/locale.categories/category.monetary/locale.money.get/Android.mk
deleted file mode 100644
index 7039ac9..0000000
--- a/test/localization/locale.categories/category.monetary/locale.money.get/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/locale.categories/category.monetary/locale.money.get/Android.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.get/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.get/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/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/Android.mk b/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/Android.mk
deleted file mode 100644
index 3e15fd7..0000000
--- a/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/Android.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN
-test_src := get_long_double_zh_CN.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR
-test_src := get_long_double_fr_FR.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US
-test_src := get_long_double_en_US.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US
-test_src := get_string_en_US.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU
-test_src := get_long_double_ru_RU.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/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.virtuals/Android.mk b/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.virtuals/Android.mk
deleted file mode 100644
index 622eecc..0000000
--- a/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.virtuals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.virtuals/Android.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.get/locale.money.get.virtuals/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/localization/locale.categories/category.monetary/locale.money.put/Android.mk b/test/localization/locale.categories/category.monetary/locale.money.put/Android.mk
deleted file mode 100644
index 9b0eb16..0000000
--- a/test/localization/locale.categories/category.monetary/locale.money.put/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/locale.categories/category.monetary/locale.money.put/Android.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.put/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.put/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/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/Android.mk b/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/Android.mk
deleted file mode 100644
index c9fa0ab..0000000
--- a/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/Android.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR
-test_src := put_long_double_fr_FR.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU
-test_src := put_long_double_ru_RU.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US
-test_src := put_long_double_en_US.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN
-test_src := put_long_double_zh_CN.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US
-test_src := put_string_en_US.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/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.virtuals/Android.mk b/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.virtuals/Android.mk
deleted file mode 100644
index c351041..0000000
--- a/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.virtuals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.virtuals/Android.mk
-
-test_name := localization/locale.categories/category.monetary/locale.money.put/locale.money.put.virtuals/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/localization/locale.categories/category.monetary/locale.moneypunct.byname/Android.mk b/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/Android.mk
deleted file mode 100644
index 36068d9..0000000
--- a/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/localization/locale.categories/category.monetary/locale.moneypunct.byname/Android.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format
-test_src := neg_format.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format
-test_src := pos_format.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping
-test_src := grouping.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct.byname/frac_digits
-test_src := frac_digits.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct.byname/negative_sign
-test_src := negative_sign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct.byname/thousands_sep
-test_src := thousands_sep.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct.byname/positive_sign
-test_src := positive_sign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct.byname/decimal_point
-test_src := decimal_point.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol
-test_src := curr_symbol.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/localization/locale.categories/category.monetary/locale.moneypunct/Android.mk b/test/localization/locale.categories/category.monetary/locale.moneypunct/Android.mk
deleted file mode 100644
index 3e1de06..0000000
--- a/test/localization/locale.categories/category.monetary/locale.moneypunct/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/localization/locale.categories/category.monetary/locale.moneypunct/Android.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct/money_base
-test_src := money_base.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct/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/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/Android.mk b/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/Android.mk
deleted file mode 100644
index 28195fc..0000000
--- a/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/Android.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/neg_format
-test_src := neg_format.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/pos_format
-test_src := pos_format.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/grouping
-test_src := grouping.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/frac_digits
-test_src := frac_digits.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/negative_sign
-test_src := negative_sign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/thousands_sep
-test_src := thousands_sep.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/positive_sign
-test_src := positive_sign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/decimal_point
-test_src := decimal_point.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/curr_symbol
-test_src := curr_symbol.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/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.virtuals/Android.mk b/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.virtuals/Android.mk
deleted file mode 100644
index e373caf..0000000
--- a/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.virtuals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.virtuals/Android.mk
-
-test_name := localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.virtuals/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/localization/locale.categories/category.numeric/Android.mk b/test/localization/locale.categories/category.numeric/Android.mk
deleted file mode 100644
index 09b459b..0000000
--- a/test/localization/locale.categories/category.numeric/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.numeric/Android.mk
-
-test_name := localization/locale.categories/category.numeric/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/localization/locale.categories/category.numeric/locale.nm.put/Android.mk b/test/localization/locale.categories/category.numeric/locale.nm.put/Android.mk
deleted file mode 100644
index 5745be4..0000000
--- a/test/localization/locale.categories/category.numeric/locale.nm.put/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/locale.categories/category.numeric/locale.nm.put/Android.mk
-
-test_name := localization/locale.categories/category.numeric/locale.nm.put/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.nm.put/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/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/Android.mk b/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/Android.mk
deleted file mode 100644
index 24e27ee..0000000
--- a/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/Android.mk
-
-test_name := localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long
-test_src := put_unsigned_long_long.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long
-test_src := put_long_long.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double
-test_src := put_long_double.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long
-test_src := put_long.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double
-test_src := put_double.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long
-test_src := put_unsigned_long.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer
-test_src := put_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool
-test_src := put_bool.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/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.virtuals/Android.mk b/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.virtuals/Android.mk
deleted file mode 100644
index 00b7b70..0000000
--- a/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.virtuals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.virtuals/Android.mk
-
-test_name := localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.virtuals/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/localization/locale.categories/category.numeric/locale.num.get/Android.mk b/test/localization/locale.categories/category.numeric/locale.num.get/Android.mk
deleted file mode 100644
index 6448080..0000000
--- a/test/localization/locale.categories/category.numeric/locale.num.get/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/locale.categories/category.numeric/locale.num.get/Android.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/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/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/Android.mk b/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/Android.mk
deleted file mode 100644
index ba42a25..0000000
--- a/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/Android.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer
-test_src := get_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int
-test_src := get_unsigned_int.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long
-test_src := get_long_long.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_min_max
-test_src := test_min_max.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float
-test_src := get_float.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool
-test_src := get_bool.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long
-test_src := get_unsigned_long_long.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short
-test_src := get_unsigned_short.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long
-test_src := get_unsigned_long.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long
-test_src := get_long.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double
-test_src := get_long_double.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double
-test_src := get_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/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.virtuals/Android.mk b/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.virtuals/Android.mk
deleted file mode 100644
index 3777ab5..0000000
--- a/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.virtuals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.virtuals/Android.mk
-
-test_name := localization/locale.categories/category.numeric/locale.num.get/facet.num.get.virtuals/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/localization/locale.categories/category.time/Android.mk b/test/localization/locale.categories/category.time/Android.mk
deleted file mode 100644
index e7b10137..0000000
--- a/test/localization/locale.categories/category.time/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.time/Android.mk
-
-test_name := localization/locale.categories/category.time/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/localization/locale.categories/category.time/locale.time.get.byname/Android.mk b/test/localization/locale.categories/category.time/locale.time.get.byname/Android.mk
deleted file mode 100644
index 52853f3..0000000
--- a/test/localization/locale.categories/category.time/locale.time.get.byname/Android.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# 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/localization/locale.categories/category.time/locale.time.get.byname/Android.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get.byname/get_monthname
-test_src := get_monthname.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide
-test_src := get_weekday_wide.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get.byname/get_one
-test_src := get_one.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get.byname/get_time
-test_src := get_time.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get.byname/get_weekday
-test_src := get_weekday.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get.byname/get_date_wide
-test_src := get_date_wide.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get.byname/get_date
-test_src := get_date.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get.byname/get_time_wide
-test_src := get_time_wide.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get.byname/date_order
-test_src := date_order.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get.byname/get_year_wide
-test_src := get_year_wide.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide
-test_src := get_monthname_wide.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get.byname/get_year
-test_src := get_year.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get.byname/get_one_wide
-test_src := get_one_wide.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get.byname/date_order_wide
-test_src := date_order_wide.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/localization/locale.categories/category.time/locale.time.get/Android.mk b/test/localization/locale.categories/category.time/locale.time.get/Android.mk
deleted file mode 100644
index 5dcc6a0..0000000
--- a/test/localization/locale.categories/category.time/locale.time.get/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/localization/locale.categories/category.time/locale.time.get/Android.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/ctor
-test_src := ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/time_base
-test_src := time_base.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/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/Android.mk b/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/Android.mk
deleted file mode 100644
index 25d53da..0000000
--- a/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/Android.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname
-test_src := get_monthname.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide
-test_src := get_weekday_wide.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one
-test_src := get_one.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time
-test_src := get_time.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday
-test_src := get_weekday.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide
-test_src := get_date_wide.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date
-test_src := get_date.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide
-test_src := get_time_wide.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order
-test_src := date_order.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide
-test_src := get_monthname_wide.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year
-test_src := get_year.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many
-test_src := get_many.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/localization/locale.categories/category.time/locale.time.get/locale.time.get.virtuals/Android.mk b/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.virtuals/Android.mk
deleted file mode 100644
index cf8133d..0000000
--- a/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.virtuals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.time/locale.time.get/locale.time.get.virtuals/Android.mk
-
-test_name := localization/locale.categories/category.time/locale.time.get/locale.time.get.virtuals/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/localization/locale.categories/category.time/locale.time.put.byname/Android.mk b/test/localization/locale.categories/category.time/locale.time.put.byname/Android.mk
deleted file mode 100644
index bd943d8..0000000
--- a/test/localization/locale.categories/category.time/locale.time.put.byname/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.time/locale.time.put.byname/Android.mk
-
-test_name := localization/locale.categories/category.time/locale.time.put.byname/put1
-test_src := put1.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/localization/locale.categories/category.time/locale.time.put/Android.mk b/test/localization/locale.categories/category.time/locale.time.put/Android.mk
deleted file mode 100644
index 75fe7e9..0000000
--- a/test/localization/locale.categories/category.time/locale.time.put/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/locale.categories/category.time/locale.time.put/Android.mk
-
-test_name := localization/locale.categories/category.time/locale.time.put/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.put/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/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/Android.mk b/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/Android.mk
deleted file mode 100644
index b60ca81..0000000
--- a/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/Android.mk
-
-test_name := localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1
-test_src := put1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2
-test_src := put2.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/localization/locale.categories/category.time/locale.time.put/locale.time.put.virtuals/Android.mk b/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.virtuals/Android.mk
deleted file mode 100644
index a654f76..0000000
--- a/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.virtuals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/category.time/locale.time.put/locale.time.put.virtuals/Android.mk
-
-test_name := localization/locale.categories/category.time/locale.time.put/locale.time.put.virtuals/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/localization/locale.categories/facet.numpunct/Android.mk b/test/localization/locale.categories/facet.numpunct/Android.mk
deleted file mode 100644
index 071eb34..0000000
--- a/test/localization/locale.categories/facet.numpunct/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/facet.numpunct/Android.mk
-
-test_name := localization/locale.categories/facet.numpunct/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/localization/locale.categories/facet.numpunct/locale.numpunct.byname/Android.mk b/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/Android.mk
deleted file mode 100644
index 20eda09..0000000
--- a/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/localization/locale.categories/facet.numpunct/locale.numpunct.byname/Android.mk
-
-test_name := localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping
-test_src := grouping.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/facet.numpunct/locale.numpunct.byname/thousands_sep
-test_src := thousands_sep.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/facet.numpunct/locale.numpunct.byname/decimal_point
-test_src := decimal_point.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/localization/locale.categories/facet.numpunct/locale.numpunct/Android.mk b/test/localization/locale.categories/facet.numpunct/locale.numpunct/Android.mk
deleted file mode 100644
index 8eff737..0000000
--- a/test/localization/locale.categories/facet.numpunct/locale.numpunct/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/locale.categories/facet.numpunct/locale.numpunct/Android.mk
-
-test_name := localization/locale.categories/facet.numpunct/locale.numpunct/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/facet.numpunct/locale.numpunct/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/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/Android.mk b/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/Android.mk
deleted file mode 100644
index 9015cbc..0000000
--- a/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/Android.mk
-
-test_name := localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/grouping
-test_src := grouping.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/falsename
-test_src := falsename.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/thousands_sep
-test_src := thousands_sep.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/decimal_point
-test_src := decimal_point.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/truename
-test_src := truename.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/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.virtuals/Android.mk b/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.virtuals/Android.mk
deleted file mode 100644
index 058000a..0000000
--- a/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.virtuals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.virtuals/Android.mk
-
-test_name := localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.virtuals/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/localization/locale.categories/facets.examples/Android.mk b/test/localization/locale.categories/facets.examples/Android.mk
deleted file mode 100644
index 57757c0..0000000
--- a/test/localization/locale.categories/facets.examples/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.categories/facets.examples/Android.mk
-
-test_name := localization/locale.categories/facets.examples/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/localization/locale.stdcvt/Android.mk b/test/localization/locale.stdcvt/Android.mk
deleted file mode 100644
index e1a4a8f..0000000
--- a/test/localization/locale.stdcvt/Android.mk
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# 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/localization/locale.stdcvt/Android.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf16_out
-test_src := codecvt_utf16_out.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf16_unshift
-test_src := codecvt_utf16_unshift.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf16_length
-test_src := codecvt_utf16_length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf16_always_noconv
-test_src := codecvt_utf16_always_noconv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf16
-test_src := codecvt_utf16.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8_length
-test_src := codecvt_utf8_length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8_utf16_encoding
-test_src := codecvt_utf8_utf16_encoding.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8_utf16_length
-test_src := codecvt_utf8_utf16_length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8_utf16_always_noconv
-test_src := codecvt_utf8_utf16_always_noconv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8_utf16_in
-test_src := codecvt_utf8_utf16_in.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf16_in
-test_src := codecvt_utf16_in.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf16_encoding
-test_src := codecvt_utf16_encoding.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8_unshift
-test_src := codecvt_utf8_unshift.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_mode
-test_src := codecvt_mode.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8_always_noconv
-test_src := codecvt_utf8_always_noconv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8_in
-test_src := codecvt_utf8_in.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8
-test_src := codecvt_utf8.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf16_max_length
-test_src := codecvt_utf16_max_length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8_utf16_max_length
-test_src := codecvt_utf8_utf16_max_length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8_out
-test_src := codecvt_utf8_out.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8_utf16_out
-test_src := codecvt_utf8_utf16_out.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8_encoding
-test_src := codecvt_utf8_encoding.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8_utf16_unshift
-test_src := codecvt_utf8_utf16_unshift.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locale.stdcvt/codecvt_utf8_max_length
-test_src := codecvt_utf8_max_length.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/localization/locale.syn/Android.mk b/test/localization/locale.syn/Android.mk
deleted file mode 100644
index b0996dd..0000000
--- a/test/localization/locale.syn/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locale.syn/Android.mk
-
-test_name := localization/locale.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/localization/locales/Android.mk b/test/localization/locales/Android.mk
deleted file mode 100644
index 1529df8..0000000
--- a/test/localization/locales/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locales/Android.mk
-
-test_name := localization/locales/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/localization/locales/locale.convenience/Android.mk b/test/localization/locales/locale.convenience/Android.mk
deleted file mode 100644
index ffefbdc..0000000
--- a/test/localization/locales/locale.convenience/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locales/locale.convenience/Android.mk
-
-test_name := localization/locales/locale.convenience/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/localization/locales/locale.convenience/classification/Android.mk b/test/localization/locales/locale.convenience/classification/Android.mk
deleted file mode 100644
index d2a6864..0000000
--- a/test/localization/locales/locale.convenience/classification/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# 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/localization/locales/locale.convenience/classification/Android.mk
-
-test_name := localization/locales/locale.convenience/classification/iscntrl
-test_src := iscntrl.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/classification/isspace
-test_src := isspace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/classification/isalpha
-test_src := isalpha.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/classification/isalnum
-test_src := isalnum.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/classification/ispunct
-test_src := ispunct.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/classification/isupper
-test_src := isupper.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/classification/isxdigit
-test_src := isxdigit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/classification/isprint
-test_src := isprint.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/classification/islower
-test_src := islower.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/classification/isgraph
-test_src := isgraph.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/classification/isdigit
-test_src := isdigit.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/localization/locales/locale.convenience/conversions/Android.mk b/test/localization/locales/locale.convenience/conversions/Android.mk
deleted file mode 100644
index 4c34913..0000000
--- a/test/localization/locales/locale.convenience/conversions/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locales/locale.convenience/conversions/Android.mk
-
-test_name := localization/locales/locale.convenience/conversions/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/localization/locales/locale.convenience/conversions/conversions.buffer/Android.mk b/test/localization/locales/locale.convenience/conversions/conversions.buffer/Android.mk
deleted file mode 100644
index e6167ca..0000000
--- a/test/localization/locales/locale.convenience/conversions/conversions.buffer/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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/localization/locales/locale.convenience/conversions/conversions.buffer/Android.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.buffer/state
-test_src := state.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.buffer/overflow
-test_src := overflow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.buffer/rdbuf
-test_src := rdbuf.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.buffer/test
-test_src := test.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.buffer/pbackfail
-test_src := pbackfail.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.buffer/underflow
-test_src := underflow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.buffer/ctor
-test_src := ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.buffer/seekoff
-test_src := seekoff.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/localization/locales/locale.convenience/conversions/conversions.character/Android.mk b/test/localization/locales/locale.convenience/conversions/conversions.character/Android.mk
deleted file mode 100644
index db35684..0000000
--- a/test/localization/locales/locale.convenience/conversions/conversions.character/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/locales/locale.convenience/conversions/conversions.character/Android.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.character/toupper
-test_src := toupper.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.character/tolower
-test_src := tolower.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/localization/locales/locale.convenience/conversions/conversions.string/Android.mk b/test/localization/locales/locale.convenience/conversions/conversions.string/Android.mk
deleted file mode 100644
index ffb398a..0000000
--- a/test/localization/locales/locale.convenience/conversions/conversions.string/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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/localization/locales/locale.convenience/conversions/conversions.string/Android.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.string/from_bytes
-test_src := from_bytes.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.string/state
-test_src := state.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt
-test_src := ctor_codecvt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.string/converted
-test_src := converted.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.string/to_bytes
-test_src := to_bytes.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.string/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.string/ctor_err_string
-test_src := ctor_err_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt_state
-test_src := ctor_codecvt_state.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/localization/locales/locale.global.templates/Android.mk b/test/localization/locales/locale.global.templates/Android.mk
deleted file mode 100644
index 4a561c3..0000000
--- a/test/localization/locales/locale.global.templates/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/locales/locale.global.templates/Android.mk
-
-test_name := localization/locales/locale.global.templates/use_facet
-test_src := use_facet.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale.global.templates/has_facet
-test_src := has_facet.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/localization/locales/locale/Android.mk b/test/localization/locales/locale/Android.mk
deleted file mode 100644
index 8fc626e..0000000
--- a/test/localization/locales/locale/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locales/locale/Android.mk
-
-test_name := localization/locales/locale/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/localization/locales/locale/locale.cons/Android.mk b/test/localization/locales/locale/locale.cons/Android.mk
deleted file mode 100644
index c0adf78..0000000
--- a/test/localization/locales/locale/locale.cons/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/localization/locales/locale/locale.cons/Android.mk
-
-test_name := localization/locales/locale/locale.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale/locale.cons/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale/locale.cons/locale_string_cat
-test_src := locale_string_cat.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale/locale.cons/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale/locale.cons/assign
-test_src := assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale/locale.cons/char_pointer
-test_src := char_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale/locale.cons/locale_facetptr
-test_src := locale_facetptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale/locale.cons/locale_locale_cat
-test_src := locale_locale_cat.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale/locale.cons/locale_char_pointer_cat
-test_src := locale_char_pointer_cat.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/localization/locales/locale/locale.members/Android.mk b/test/localization/locales/locale/locale.members/Android.mk
deleted file mode 100644
index 58721ab..0000000
--- a/test/localization/locales/locale/locale.members/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/locales/locale/locale.members/Android.mk
-
-test_name := localization/locales/locale/locale.members/combine
-test_src := combine.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale/locale.members/name
-test_src := name.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/localization/locales/locale/locale.operators/Android.mk b/test/localization/locales/locale/locale.operators/Android.mk
deleted file mode 100644
index f4b3c82..0000000
--- a/test/localization/locales/locale/locale.operators/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/locales/locale/locale.operators/Android.mk
-
-test_name := localization/locales/locale/locale.operators/compare
-test_src := compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale/locale.operators/eq
-test_src := 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/localization/locales/locale/locale.statics/Android.mk b/test/localization/locales/locale/locale.statics/Android.mk
deleted file mode 100644
index e597c7a..0000000
--- a/test/localization/locales/locale/locale.statics/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/localization/locales/locale/locale.statics/Android.mk
-
-test_name := localization/locales/locale/locale.statics/classic
-test_src := classic.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := localization/locales/locale/locale.statics/global
-test_src := global.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/localization/locales/locale/locale.types/Android.mk b/test/localization/locales/locale/locale.types/Android.mk
deleted file mode 100644
index 6356f9a..0000000
--- a/test/localization/locales/locale/locale.types/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locales/locale/locale.types/Android.mk
-
-test_name := localization/locales/locale/locale.types/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/localization/locales/locale/locale.types/locale.category/Android.mk b/test/localization/locales/locale/locale.types/locale.category/Android.mk
deleted file mode 100644
index 8ead2e2..0000000
--- a/test/localization/locales/locale/locale.types/locale.category/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locales/locale/locale.types/locale.category/Android.mk
-
-test_name := localization/locales/locale/locale.types/locale.category/category
-test_src := category.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/localization/locales/locale/locale.types/locale.facet/Android.mk b/test/localization/locales/locale/locale.types/locale.facet/Android.mk
deleted file mode 100644
index 9301ab3..0000000
--- a/test/localization/locales/locale/locale.types/locale.facet/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locales/locale/locale.types/locale.facet/Android.mk
-
-test_name := localization/locales/locale/locale.types/locale.facet/facet
-test_src := facet.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/localization/locales/locale/locale.types/locale.id/Android.mk b/test/localization/locales/locale/locale.types/locale.id/Android.mk
deleted file mode 100644
index cc67161..0000000
--- a/test/localization/locales/locale/locale.types/locale.id/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/locales/locale/locale.types/locale.id/Android.mk
-
-test_name := localization/locales/locale/locale.types/locale.id/id
-test_src := id.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/localization/localization.general/Android.mk b/test/localization/localization.general/Android.mk
deleted file mode 100644
index 7a182e2..0000000
--- a/test/localization/localization.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/localization/localization.general/Android.mk
-
-test_name := localization/localization.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/makemake.py b/test/makemake.py
deleted file mode 100644
index 7f76732..0000000
--- a/test/makemake.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-import os
-
-
-def main():
-    build_mk_path = 'external/libcxx/test/Android.build.mk'
-    for root, _dirs, files in os.walk('.'):
-        tests = []
-        for test in [x for x in files if x.endswith('.pass.cpp')]:
-            path = os.path.join(root, test)
-            out_name = os.path.splitext(path)[0]    # trim .cpp
-            out_name = os.path.splitext(out_name)[0]    # trim .pass
-            out_name = os.path.normpath(out_name)
-            tests.append((test, out_name))
-        with open(os.path.join(root, 'Android.mk'), 'w') as makefile:
-            makefile_path = os.path.normpath(os.path.join(
-                    'external/libcxx/test/', root, 'Android.mk'))
-            makefile.write('''#
-# 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.
-#
-''')
-            makefile.write('LOCAL_PATH := $(call my-dir)\n')
-            makefile.write('test_makefile := {}\n'.format(makefile_path))
-            if len(tests) > 0:
-                for test, out_name in tests:
-                    makefile.write('''
-test_name := {}
-test_src := {}
-include {}
-'''.format(out_name, test, build_mk_path))
-            makefile.write(
-                    '\ninclude $(call all-makefiles-under,$(LOCAL_PATH))')
-
-
-if __name__ == '__main__':
-    main()
diff --git a/test/numerics/Android.mk b/test/numerics/Android.mk
deleted file mode 100644
index 22d3580..0000000
--- a/test/numerics/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index d40a0b4..0000000
--- a/test/numerics/c.math/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/test/numerics/cfenv/Android.mk b/test/numerics/cfenv/Android.mk
deleted file mode 100644
index 8365c11..0000000
--- a/test/numerics/cfenv/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 3c90394..0000000
--- a/test/numerics/cfenv/cfenv.syn/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index b6782ff..0000000
--- a/test/numerics/complex.number/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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
deleted file mode 100644
index 5523678..0000000
--- a/test/numerics/complex.number/ccmplx/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index cbd8fe1..0000000
--- a/test/numerics/complex.number/cmplx.over/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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
deleted file mode 100644
index fa46214..0000000
--- a/test/numerics/complex.number/complex.literals/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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
deleted file mode 100644
index 356eefb..0000000
--- a/test/numerics/complex.number/complex.member.ops/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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
deleted file mode 100644
index 0cedf0e..0000000
--- a/test/numerics/complex.number/complex.members/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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
deleted file mode 100644
index 9736b57..0000000
--- a/test/numerics/complex.number/complex.ops/Android.mk
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# 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
deleted file mode 100644
index 60ae725..0000000
--- a/test/numerics/complex.number/complex.special/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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
deleted file mode 100644
index ef3bef5..0000000
--- a/test/numerics/complex.number/complex.synopsis/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index a14045b..0000000
--- a/test/numerics/complex.number/complex.transcendentals/Android.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# 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
deleted file mode 100644
index 8693a49..0000000
--- a/test/numerics/complex.number/complex.value.ops/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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
deleted file mode 100644
index 56866c8..0000000
--- a/test/numerics/complex.number/complex/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index aecd708..0000000
--- a/test/numerics/numarray/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index aa40fe5..0000000
--- a/test/numerics/numarray/class.gslice/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 8b03123..0000000
--- a/test/numerics/numarray/class.gslice/gslice.access/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index a8a6ba2..0000000
--- a/test/numerics/numarray/class.gslice/gslice.cons/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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
deleted file mode 100644
index 8b44af1..0000000
--- a/test/numerics/numarray/class.slice/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index ea51bc6..0000000
--- a/test/numerics/numarray/class.slice/cons.slice/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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
deleted file mode 100644
index 8238390..0000000
--- a/test/numerics/numarray/class.slice/slice.access/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 7ff7b28..0000000
--- a/test/numerics/numarray/template.gslice.array/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 8231dc0..0000000
--- a/test/numerics/numarray/template.gslice.array/gslice.array.assign/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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
deleted file mode 100644
index b663cde..0000000
--- a/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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
deleted file mode 100644
index ecf84cf..0000000
--- a/test/numerics/numarray/template.gslice.array/gslice.array.fill/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index bfc563e..0000000
--- a/test/numerics/numarray/template.indirect.array/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 1cc27ce..0000000
--- a/test/numerics/numarray/template.indirect.array/indirect.array.assign/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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
deleted file mode 100644
index c8289d4..0000000
--- a/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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
deleted file mode 100644
index 77aa4f6..0000000
--- a/test/numerics/numarray/template.indirect.array/indirect.array.fill/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 34b164c..0000000
--- a/test/numerics/numarray/template.mask.array/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 1d320f8..0000000
--- a/test/numerics/numarray/template.mask.array/mask.array.assign/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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
deleted file mode 100644
index c3826d8..0000000
--- a/test/numerics/numarray/template.mask.array/mask.array.comp.assign/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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
deleted file mode 100644
index 507ed0d..0000000
--- a/test/numerics/numarray/template.mask.array/mask.array.fill/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index fc63424..0000000
--- a/test/numerics/numarray/template.slice.array/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index c71453d..0000000
--- a/test/numerics/numarray/template.slice.array/slice.arr.assign/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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
deleted file mode 100644
index fbcaf6e..0000000
--- a/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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
deleted file mode 100644
index 85ad2a9..0000000
--- a/test/numerics/numarray/template.slice.array/slice.arr.fill/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 47fa67e..0000000
--- a/test/numerics/numarray/template.valarray/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index f6942d4..0000000
--- a/test/numerics/numarray/template.valarray/valarray.access/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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
deleted file mode 100644
index 5dabbf0..0000000
--- a/test/numerics/numarray/template.valarray/valarray.assign/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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
deleted file mode 100644
index d9f8f11..0000000
--- a/test/numerics/numarray/template.valarray/valarray.cassign/Android.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# 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
deleted file mode 100644
index 3da9bc2..0000000
--- a/test/numerics/numarray/template.valarray/valarray.cons/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# 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
deleted file mode 100644
index e96a0ec..0000000
--- a/test/numerics/numarray/template.valarray/valarray.members/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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
deleted file mode 100644
index f8bf548..0000000
--- a/test/numerics/numarray/template.valarray/valarray.sub/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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
deleted file mode 100644
index 04fa790..0000000
--- a/test/numerics/numarray/template.valarray/valarray.unary/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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
deleted file mode 100644
index cc5749f..0000000
--- a/test/numerics/numarray/valarray.nonmembers/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 1de8f39..0000000
--- a/test/numerics/numarray/valarray.nonmembers/valarray.binary/Android.mk
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-# 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
deleted file mode 100644
index 2bb1ebc..0000000
--- a/test/numerics/numarray/valarray.nonmembers/valarray.comparison/Android.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# 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
deleted file mode 100644
index 29d45cd..0000000
--- a/test/numerics/numarray/valarray.nonmembers/valarray.special/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 63c0073..0000000
--- a/test/numerics/numarray/valarray.nonmembers/valarray.transcend/Android.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# 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
deleted file mode 100644
index 3602167..0000000
--- a/test/numerics/numarray/valarray.range/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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
deleted file mode 100644
index 1be7346..0000000
--- a/test/numerics/numarray/valarray.syn/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index a120dfb..0000000
--- a/test/numerics/numeric.ops/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 72243b7..0000000
--- a/test/numerics/numeric.ops/accumulate/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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
deleted file mode 100644
index e01a5cc..0000000
--- a/test/numerics/numeric.ops/adjacent.difference/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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
deleted file mode 100644
index e586d8e..0000000
--- a/test/numerics/numeric.ops/inner.product/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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
deleted file mode 100644
index f16eb51..0000000
--- a/test/numerics/numeric.ops/numeric.iota/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index d832758..0000000
--- a/test/numerics/numeric.ops/partial.sum/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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
deleted file mode 100644
index d3d1c20..0000000
--- a/test/numerics/numeric.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 40003dc..0000000
--- a/test/numerics/numerics.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 666c954..0000000
--- a/test/numerics/rand/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 59295d5..0000000
--- a/test/numerics/rand/rand.adapt/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 2f0e567..0000000
--- a/test/numerics/rand/rand.adapt/rand.adapt.disc/Android.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# 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
deleted file mode 100644
index c966935..0000000
--- a/test/numerics/rand/rand.adapt/rand.adapt.ibits/Android.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# 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
deleted file mode 100644
index 0578bae..0000000
--- a/test/numerics/rand/rand.adapt/rand.adapt.shuf/Android.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# 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
deleted file mode 100644
index 524f184..0000000
--- a/test/numerics/rand/rand.device/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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
deleted file mode 100644
index e143244..0000000
--- a/test/numerics/rand/rand.dis/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index d36081f..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.bern/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 7b522b0..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index fe9b340..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index 2968f9e..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index 36bbcd4..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index 6be6216..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.norm/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 95636eb..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index 3e76cef..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index 9e36bde..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index d451f29..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index 8e845be..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index 5679a57..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index be43e91..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.pois/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 3e4c1ef..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index 6e02a6c..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index 773b986..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index 6bc554a..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index 6395cc3..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index 24ada45..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.samp/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 1a7cfde..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/Android.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# 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
deleted file mode 100644
index 736ffed..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/Android.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# 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
deleted file mode 100644
index 3aacdd5..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/Android.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# 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
deleted file mode 100644
index db38c7c..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.uni/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 50b4d3b..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index 6be8475..0000000
--- a/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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
deleted file mode 100644
index e01e1c9..0000000
--- a/test/numerics/rand/rand.eng/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 73e8267..0000000
--- a/test/numerics/rand/rand.eng/rand.eng.lcong/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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
deleted file mode 100644
index db4bf82..0000000
--- a/test/numerics/rand/rand.eng/rand.eng.mers/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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
deleted file mode 100644
index d9163d9..0000000
--- a/test/numerics/rand/rand.eng/rand.eng.sub/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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
deleted file mode 100644
index b2a0f0a..0000000
--- a/test/numerics/rand/rand.predef/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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
deleted file mode 100644
index f3da578..0000000
--- a/test/numerics/rand/rand.req/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 1c2dbd8..0000000
--- a/test/numerics/rand/rand.req/rand.req.adapt/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 40084e2..0000000
--- a/test/numerics/rand/rand.req/rand.req.dst/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 5523528..0000000
--- a/test/numerics/rand/rand.req/rand.req.eng/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index cdb6a3c..0000000
--- a/test/numerics/rand/rand.req/rand.req.genl/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 066c9fa..0000000
--- a/test/numerics/rand/rand.req/rand.req.seedseq/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 03a9b0a..0000000
--- a/test/numerics/rand/rand.req/rand.req.urng/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 34aeedc..0000000
--- a/test/numerics/rand/rand.synopsis/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 5ad6989..0000000
--- a/test/numerics/rand/rand.util/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 2bceac7..0000000
--- a/test/numerics/rand/rand.util/rand.util.canonical/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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
deleted file mode 100644
index 3ee2bce..0000000
--- a/test/numerics/rand/rand.util/rand.util.seedseq/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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
diff --git a/test/re/Android.mk b/test/re/Android.mk
deleted file mode 100644
index bbb3747..0000000
--- a/test/re/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/Android.mk
-
-test_name := re/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/re/re.alg/Android.mk b/test/re/re.alg/Android.mk
deleted file mode 100644
index 7af7def..0000000
--- a/test/re/re.alg/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.alg/Android.mk
-
-test_name := re/re.alg/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/re/re.alg/re.alg.match/Android.mk b/test/re/re.alg/re.alg.match/Android.mk
deleted file mode 100644
index 626e976..0000000
--- a/test/re/re.alg/re.alg.match/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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/re/re.alg/re.alg.match/Android.mk
-
-test_name := re/re.alg/re.alg.match/awk
-test_src := awk.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.match/grep
-test_src := grep.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.match/egrep
-test_src := egrep.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.match/ecma
-test_src := ecma.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.match/extended
-test_src := extended.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.match/basic
-test_src := basic.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.match/parse_curly_brackets
-test_src := parse_curly_brackets.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.match/lookahead_capture
-test_src := lookahead_capture.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/re/re.alg/re.alg.replace/Android.mk b/test/re/re.alg/re.alg.replace/Android.mk
deleted file mode 100644
index ef538f5..0000000
--- a/test/re/re.alg/re.alg.replace/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/re/re.alg/re.alg.replace/Android.mk
-
-test_name := re/re.alg/re.alg.replace/test2
-test_src := test2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.replace/test3
-test_src := test3.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.replace/test5
-test_src := test5.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.replace/test1
-test_src := test1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.replace/test6
-test_src := test6.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.replace/test4
-test_src := test4.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/re/re.alg/re.alg.search/Android.mk b/test/re/re.alg/re.alg.search/Android.mk
deleted file mode 100644
index 1e9dc8f..0000000
--- a/test/re/re.alg/re.alg.search/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/re/re.alg/re.alg.search/Android.mk
-
-test_name := re/re.alg/re.alg.search/awk
-test_src := awk.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.search/grep
-test_src := grep.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.search/egrep
-test_src := egrep.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.search/ecma
-test_src := ecma.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.search/extended
-test_src := extended.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.search/no_update_pos
-test_src := no_update_pos.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.search/basic
-test_src := basic.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.search/lookahead
-test_src := lookahead.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.alg/re.alg.search/backup
-test_src := backup.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/re/re.alg/re.except/Android.mk b/test/re/re.alg/re.except/Android.mk
deleted file mode 100644
index 078cddd..0000000
--- a/test/re/re.alg/re.except/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.alg/re.except/Android.mk
-
-test_name := re/re.alg/re.except/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/re/re.badexp/Android.mk b/test/re/re.badexp/Android.mk
deleted file mode 100644
index 5094462..0000000
--- a/test/re/re.badexp/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.badexp/Android.mk
-
-test_name := re/re.badexp/regex_error
-test_src := regex_error.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/re/re.const/Android.mk b/test/re/re.const/Android.mk
deleted file mode 100644
index e5c83f4..0000000
--- a/test/re/re.const/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.const/Android.mk
-
-test_name := re/re.const/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/re/re.const/re.err/Android.mk b/test/re/re.const/re.err/Android.mk
deleted file mode 100644
index 2fd6255..0000000
--- a/test/re/re.const/re.err/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.const/re.err/Android.mk
-
-test_name := re/re.const/re.err/error_type
-test_src := error_type.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/re/re.const/re.matchflag/Android.mk b/test/re/re.const/re.matchflag/Android.mk
deleted file mode 100644
index 1ec00c6..0000000
--- a/test/re/re.const/re.matchflag/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.const/re.matchflag/Android.mk
-
-test_name := re/re.const/re.matchflag/match_flag_type
-test_src := match_flag_type.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/re/re.const/re.synopt/Android.mk b/test/re/re.const/re.synopt/Android.mk
deleted file mode 100644
index 4305a44..0000000
--- a/test/re/re.const/re.synopt/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.const/re.synopt/Android.mk
-
-test_name := re/re.const/re.synopt/syntax_option_type
-test_src := syntax_option_type.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/re/re.def/Android.mk b/test/re/re.def/Android.mk
deleted file mode 100644
index 7270b96..0000000
--- a/test/re/re.def/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.def/Android.mk
-
-test_name := re/re.def/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/re/re.def/defns.regex.collating.element/Android.mk b/test/re/re.def/defns.regex.collating.element/Android.mk
deleted file mode 100644
index 49c345d..0000000
--- a/test/re/re.def/defns.regex.collating.element/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.def/defns.regex.collating.element/Android.mk
-
-test_name := re/re.def/defns.regex.collating.element/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/re/re.def/defns.regex.finite.state.machine/Android.mk b/test/re/re.def/defns.regex.finite.state.machine/Android.mk
deleted file mode 100644
index 722cc59..0000000
--- a/test/re/re.def/defns.regex.finite.state.machine/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.def/defns.regex.finite.state.machine/Android.mk
-
-test_name := re/re.def/defns.regex.finite.state.machine/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/re/re.def/defns.regex.format.specifier/Android.mk b/test/re/re.def/defns.regex.format.specifier/Android.mk
deleted file mode 100644
index cd1e32a..0000000
--- a/test/re/re.def/defns.regex.format.specifier/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.def/defns.regex.format.specifier/Android.mk
-
-test_name := re/re.def/defns.regex.format.specifier/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/re/re.def/defns.regex.matched/Android.mk b/test/re/re.def/defns.regex.matched/Android.mk
deleted file mode 100644
index 42efe83..0000000
--- a/test/re/re.def/defns.regex.matched/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.def/defns.regex.matched/Android.mk
-
-test_name := re/re.def/defns.regex.matched/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/re/re.def/defns.regex.primary.equivalence.class/Android.mk b/test/re/re.def/defns.regex.primary.equivalence.class/Android.mk
deleted file mode 100644
index 9391d01..0000000
--- a/test/re/re.def/defns.regex.primary.equivalence.class/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.def/defns.regex.primary.equivalence.class/Android.mk
-
-test_name := re/re.def/defns.regex.primary.equivalence.class/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/re/re.def/defns.regex.regular.expression/Android.mk b/test/re/re.def/defns.regex.regular.expression/Android.mk
deleted file mode 100644
index 5656709..0000000
--- a/test/re/re.def/defns.regex.regular.expression/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.def/defns.regex.regular.expression/Android.mk
-
-test_name := re/re.def/defns.regex.regular.expression/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/re/re.def/defns.regex.subexpression/Android.mk b/test/re/re.def/defns.regex.subexpression/Android.mk
deleted file mode 100644
index baef6a9..0000000
--- a/test/re/re.def/defns.regex.subexpression/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.def/defns.regex.subexpression/Android.mk
-
-test_name := re/re.def/defns.regex.subexpression/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/re/re.general/Android.mk b/test/re/re.general/Android.mk
deleted file mode 100644
index 9c3f6d2..0000000
--- a/test/re/re.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.general/Android.mk
-
-test_name := re/re.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/re/re.grammar/Android.mk b/test/re/re.grammar/Android.mk
deleted file mode 100644
index 27a79cf..0000000
--- a/test/re/re.grammar/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.grammar/Android.mk
-
-test_name := re/re.grammar/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/re/re.iter/Android.mk b/test/re/re.iter/Android.mk
deleted file mode 100644
index e0f0db4..0000000
--- a/test/re/re.iter/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.iter/Android.mk
-
-test_name := re/re.iter/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/re/re.iter/re.regiter/Android.mk b/test/re/re.iter/re.regiter/Android.mk
deleted file mode 100644
index c3f6f84..0000000
--- a/test/re/re.iter/re.regiter/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.iter/re.regiter/Android.mk
-
-test_name := re/re.iter/re.regiter/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/re/re.iter/re.regiter/re.regiter.cnstr/Android.mk b/test/re/re.iter/re.regiter/re.regiter.cnstr/Android.mk
deleted file mode 100644
index 0d63380..0000000
--- a/test/re/re.iter/re.regiter/re.regiter.cnstr/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/re/re.iter/re.regiter/re.regiter.cnstr/Android.mk
-
-test_name := re/re.iter/re.regiter/re.regiter.cnstr/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.iter/re.regiter/re.regiter.cnstr/cnstr
-test_src := cnstr.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/re/re.iter/re.regiter/re.regiter.comp/Android.mk b/test/re/re.iter/re.regiter/re.regiter.comp/Android.mk
deleted file mode 100644
index e4df196..0000000
--- a/test/re/re.iter/re.regiter/re.regiter.comp/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.iter/re.regiter/re.regiter.comp/Android.mk
-
-test_name := re/re.iter/re.regiter/re.regiter.comp/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/re/re.iter/re.regiter/re.regiter.deref/Android.mk b/test/re/re.iter/re.regiter/re.regiter.deref/Android.mk
deleted file mode 100644
index 57a99ab..0000000
--- a/test/re/re.iter/re.regiter/re.regiter.deref/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.iter/re.regiter/re.regiter.deref/Android.mk
-
-test_name := re/re.iter/re.regiter/re.regiter.deref/deref
-test_src := deref.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/re/re.iter/re.regiter/re.regiter.incr/Android.mk b/test/re/re.iter/re.regiter/re.regiter.incr/Android.mk
deleted file mode 100644
index 504b637..0000000
--- a/test/re/re.iter/re.regiter/re.regiter.incr/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.iter/re.regiter/re.regiter.incr/Android.mk
-
-test_name := re/re.iter/re.regiter/re.regiter.incr/post
-test_src := post.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/re/re.iter/re.tokiter/Android.mk b/test/re/re.iter/re.tokiter/Android.mk
deleted file mode 100644
index a95fa46..0000000
--- a/test/re/re.iter/re.tokiter/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.iter/re.tokiter/Android.mk
-
-test_name := re/re.iter/re.tokiter/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/re/re.iter/re.tokiter/re.tokiter.cnstr/Android.mk b/test/re/re.iter/re.tokiter/re.tokiter.cnstr/Android.mk
deleted file mode 100644
index 9124d81..0000000
--- a/test/re/re.iter/re.tokiter/re.tokiter.cnstr/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/re/re.iter/re.tokiter/re.tokiter.cnstr/Android.mk
-
-test_name := re/re.iter/re.tokiter/re.tokiter.cnstr/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.iter/re.tokiter/re.tokiter.cnstr/int
-test_src := int.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.iter/re.tokiter/re.tokiter.cnstr/array
-test_src := array.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.iter/re.tokiter/re.tokiter.cnstr/init
-test_src := init.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.iter/re.tokiter/re.tokiter.cnstr/vector
-test_src := vector.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/re/re.iter/re.tokiter/re.tokiter.comp/Android.mk b/test/re/re.iter/re.tokiter/re.tokiter.comp/Android.mk
deleted file mode 100644
index 1766980..0000000
--- a/test/re/re.iter/re.tokiter/re.tokiter.comp/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.iter/re.tokiter/re.tokiter.comp/Android.mk
-
-test_name := re/re.iter/re.tokiter/re.tokiter.comp/equal
-test_src := equal.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/re/re.iter/re.tokiter/re.tokiter.deref/Android.mk b/test/re/re.iter/re.tokiter/re.tokiter.deref/Android.mk
deleted file mode 100644
index e619c8e..0000000
--- a/test/re/re.iter/re.tokiter/re.tokiter.deref/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.iter/re.tokiter/re.tokiter.deref/Android.mk
-
-test_name := re/re.iter/re.tokiter/re.tokiter.deref/deref
-test_src := deref.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/re/re.iter/re.tokiter/re.tokiter.incr/Android.mk b/test/re/re.iter/re.tokiter/re.tokiter.incr/Android.mk
deleted file mode 100644
index 9cb1185..0000000
--- a/test/re/re.iter/re.tokiter/re.tokiter.incr/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.iter/re.tokiter/re.tokiter.incr/Android.mk
-
-test_name := re/re.iter/re.tokiter/re.tokiter.incr/post
-test_src := post.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/re/re.regex/Android.mk b/test/re/re.regex/Android.mk
deleted file mode 100644
index 95ce82f..0000000
--- a/test/re/re.regex/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.regex/Android.mk
-
-test_name := re/re.regex/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/re/re.regex/re.regex.assign/Android.mk b/test/re/re.regex/re.regex.assign/Android.mk
deleted file mode 100644
index fd1492a..0000000
--- a/test/re/re.regex/re.regex.assign/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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/re/re.regex/re.regex.assign/Android.mk
-
-test_name := re/re.regex/re.regex.assign/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.assign/assign_ptr_size_flag
-test_src := assign_ptr_size_flag.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.assign/il
-test_src := il.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.assign/assign_ptr_flag
-test_src := assign_ptr_flag.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.assign/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.assign/assign
-test_src := assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.assign/assign_iter_iter_flag
-test_src := assign_iter_iter_flag.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.assign/ptr
-test_src := ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.assign/assign.il
-test_src := assign.il.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.assign/assign_string_flag
-test_src := assign_string_flag.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/re/re.regex/re.regex.const/Android.mk b/test/re/re.regex/re.regex.const/Android.mk
deleted file mode 100644
index cdf1060..0000000
--- a/test/re/re.regex/re.regex.const/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.regex/re.regex.const/Android.mk
-
-test_name := re/re.regex/re.regex.const/constants
-test_src := constants.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/re/re.regex/re.regex.construct/Android.mk b/test/re/re.regex/re.regex.construct/Android.mk
deleted file mode 100644
index 88dcb36..0000000
--- a/test/re/re.regex/re.regex.construct/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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/re/re.regex/re.regex.construct/Android.mk
-
-test_name := re/re.regex/re.regex.construct/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.construct/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.construct/awk_oct
-test_src := awk_oct.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.construct/iter_iter_flg
-test_src := iter_iter_flg.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.construct/iter_iter
-test_src := iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.construct/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.construct/ptr_size_flg
-test_src := ptr_size_flg.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.construct/bad_escape
-test_src := bad_escape.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.construct/ptr
-test_src := ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.construct/string_flg
-test_src := string_flg.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.construct/ptr_flg
-test_src := ptr_flg.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.regex/re.regex.construct/il_flg
-test_src := il_flg.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/re/re.regex/re.regex.locale/Android.mk b/test/re/re.regex/re.regex.locale/Android.mk
deleted file mode 100644
index cd3f30c..0000000
--- a/test/re/re.regex/re.regex.locale/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.regex/re.regex.locale/Android.mk
-
-test_name := re/re.regex/re.regex.locale/imbue
-test_src := imbue.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/re/re.regex/re.regex.nonmemb/Android.mk b/test/re/re.regex/re.regex.nonmemb/Android.mk
deleted file mode 100644
index e79639c..0000000
--- a/test/re/re.regex/re.regex.nonmemb/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.regex/re.regex.nonmemb/Android.mk
-
-test_name := re/re.regex/re.regex.nonmemb/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/re/re.regex/re.regex.nonmemb/re.regex.nmswap/Android.mk b/test/re/re.regex/re.regex.nonmemb/re.regex.nmswap/Android.mk
deleted file mode 100644
index 0c7923f..0000000
--- a/test/re/re.regex/re.regex.nonmemb/re.regex.nmswap/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.regex/re.regex.nonmemb/re.regex.nmswap/Android.mk
-
-test_name := re/re.regex/re.regex.nonmemb/re.regex.nmswap/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/re/re.regex/re.regex.operations/Android.mk b/test/re/re.regex/re.regex.operations/Android.mk
deleted file mode 100644
index 7bae1a4..0000000
--- a/test/re/re.regex/re.regex.operations/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.regex/re.regex.operations/Android.mk
-
-test_name := re/re.regex/re.regex.operations/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/re/re.regex/re.regex.swap/Android.mk b/test/re/re.regex/re.regex.swap/Android.mk
deleted file mode 100644
index 193724e..0000000
--- a/test/re/re.regex/re.regex.swap/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.regex/re.regex.swap/Android.mk
-
-test_name := re/re.regex/re.regex.swap/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/re/re.req/Android.mk b/test/re/re.req/Android.mk
deleted file mode 100644
index b4796c1..0000000
--- a/test/re/re.req/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.req/Android.mk
-
-test_name := re/re.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/re/re.results/Android.mk b/test/re/re.results/Android.mk
deleted file mode 100644
index 34971ba..0000000
--- a/test/re/re.results/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.results/Android.mk
-
-test_name := re/re.results/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/re/re.results/re.results.acc/Android.mk b/test/re/re.results/re.results.acc/Android.mk
deleted file mode 100644
index 9684db2..0000000
--- a/test/re/re.results/re.results.acc/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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/re/re.results/re.results.acc/Android.mk
-
-test_name := re/re.results/re.results.acc/length
-test_src := length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.results/re.results.acc/cbegin_cend
-test_src := cbegin_cend.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.results/re.results.acc/suffix
-test_src := suffix.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.results/re.results.acc/position
-test_src := position.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.results/re.results.acc/index
-test_src := index.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.results/re.results.acc/prefix
-test_src := prefix.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.results/re.results.acc/begin_end
-test_src := begin_end.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.results/re.results.acc/str
-test_src := str.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/re/re.results/re.results.all/Android.mk b/test/re/re.results/re.results.all/Android.mk
deleted file mode 100644
index 0cb567f..0000000
--- a/test/re/re.results/re.results.all/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.results/re.results.all/Android.mk
-
-test_name := re/re.results/re.results.all/get_allocator
-test_src := get_allocator.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/re/re.results/re.results.const/Android.mk b/test/re/re.results/re.results.const/Android.mk
deleted file mode 100644
index f55c29e..0000000
--- a/test/re/re.results/re.results.const/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/re/re.results/re.results.const/Android.mk
-
-test_name := re/re.results/re.results.const/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.results/re.results.const/allocator
-test_src := allocator.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/re/re.results/re.results.form/Android.mk b/test/re/re.results/re.results.form/Android.mk
deleted file mode 100644
index 8d05879..0000000
--- a/test/re/re.results/re.results.form/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/re/re.results/re.results.form/Android.mk
-
-test_name := re/re.results/re.results.form/form1
-test_src := form1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.results/re.results.form/form4
-test_src := form4.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.results/re.results.form/form2
-test_src := form2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.results/re.results.form/form3
-test_src := form3.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/re/re.results/re.results.nonmember/Android.mk b/test/re/re.results/re.results.nonmember/Android.mk
deleted file mode 100644
index 22309a1..0000000
--- a/test/re/re.results/re.results.nonmember/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.results/re.results.nonmember/Android.mk
-
-test_name := re/re.results/re.results.nonmember/equal
-test_src := equal.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/re/re.results/re.results.size/Android.mk b/test/re/re.results/re.results.size/Android.mk
deleted file mode 100644
index 2f55473..0000000
--- a/test/re/re.results/re.results.size/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/re/re.results/re.results.size/Android.mk
-
-test_name := re/re.results/re.results.size/max_size
-test_src := max_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.results/re.results.size/empty
-test_src := empty.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/re/re.results/re.results.state/Android.mk b/test/re/re.results/re.results.state/Android.mk
deleted file mode 100644
index 1c90447..0000000
--- a/test/re/re.results/re.results.state/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.results/re.results.state/Android.mk
-
-test_name := re/re.results/re.results.state/ready
-test_src := ready.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/re/re.results/re.results.swap/Android.mk b/test/re/re.results/re.results.swap/Android.mk
deleted file mode 100644
index 6873e1b..0000000
--- a/test/re/re.results/re.results.swap/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/re/re.results/re.results.swap/Android.mk
-
-test_name := re/re.results/re.results.swap/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.results/re.results.swap/non_member_swap
-test_src := non_member_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/re/re.submatch/Android.mk b/test/re/re.submatch/Android.mk
deleted file mode 100644
index 8c1b621..0000000
--- a/test/re/re.submatch/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/re/re.submatch/Android.mk
-
-test_name := re/re.submatch/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/re/re.submatch/re.submatch.members/Android.mk b/test/re/re.submatch/re.submatch.members/Android.mk
deleted file mode 100644
index d5daad4..0000000
--- a/test/re/re.submatch/re.submatch.members/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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/re/re.submatch/re.submatch.members/Android.mk
-
-test_name := re/re.submatch/re.submatch.members/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.submatch/re.submatch.members/compare_string_type
-test_src := compare_string_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.submatch/re.submatch.members/length
-test_src := length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.submatch/re.submatch.members/operator_string
-test_src := operator_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.submatch/re.submatch.members/compare_value_type_ptr
-test_src := compare_value_type_ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.submatch/re.submatch.members/compare_sub_match
-test_src := compare_sub_match.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.submatch/re.submatch.members/str
-test_src := str.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/re/re.submatch/re.submatch.op/Android.mk b/test/re/re.submatch/re.submatch.op/Android.mk
deleted file mode 100644
index a8bfe3b..0000000
--- a/test/re/re.submatch/re.submatch.op/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/re/re.submatch/re.submatch.op/Android.mk
-
-test_name := re/re.submatch/re.submatch.op/compare
-test_src := compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.submatch/re.submatch.op/stream
-test_src := stream.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/re/re.syn/Android.mk b/test/re/re.syn/Android.mk
deleted file mode 100644
index 771d166..0000000
--- a/test/re/re.syn/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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/re/re.syn/Android.mk
-
-test_name := re/re.syn/cregex_iterator
-test_src := cregex_iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/wcmatch
-test_src := wcmatch.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/wcregex_token_iterator
-test_src := wcregex_token_iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/ssub_match
-test_src := ssub_match.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/csub_match
-test_src := csub_match.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/wsmatch
-test_src := wsmatch.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/wcregex_iterator
-test_src := wcregex_iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/wregex
-test_src := wregex.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/wcsub_match
-test_src := wcsub_match.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/sregex_token_iterator
-test_src := sregex_token_iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/wsregex_iterator
-test_src := wsregex_iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/smatch
-test_src := smatch.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/wsregex_token_iterator
-test_src := wsregex_token_iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/cmatch
-test_src := cmatch.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/wssub_match
-test_src := wssub_match.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/regex
-test_src := regex.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/sregex_iterator
-test_src := sregex_iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.syn/cregex_token_iterator
-test_src := cregex_token_iterator.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/re/re.traits/Android.mk b/test/re/re.traits/Android.mk
deleted file mode 100644
index 6dcc4e0..0000000
--- a/test/re/re.traits/Android.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# 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/re/re.traits/Android.mk
-
-test_name := re/re.traits/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.traits/lookup_classname
-test_src := lookup_classname.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.traits/length
-test_src := length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.traits/transform
-test_src := transform.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.traits/translate_nocase
-test_src := translate_nocase.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.traits/translate
-test_src := translate.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.traits/imbue
-test_src := imbue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.traits/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.traits/isctype
-test_src := isctype.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.traits/value
-test_src := value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.traits/lookup_collatename
-test_src := lookup_collatename.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.traits/getloc
-test_src := getloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := re/re.traits/transform_primary
-test_src := transform_primary.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/runtests.py b/test/runtests.py
deleted file mode 100644
index 2d1bf85..0000000
--- a/test/runtests.py
+++ /dev/null
@@ -1,174 +0,0 @@
-# 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.
-import getopt
-import multiprocessing
-import os
-import re
-import subprocess
-import sys
-
-
-class ProgressBarWrapper(object):
-    def __init__(self, maxval):
-        try:
-            import progressbar
-            self.pb = progressbar.ProgressBar(maxval=maxval)
-        except ImportError:
-            self.pb = None
-
-    def start(self):
-        if self.pb:
-            self.pb.start()
-
-    def update(self, value):
-        if self.pb:
-            self.pb.update(value)
-
-    def finish(self):
-        if self.pb:
-            self.pb.finish()
-
-
-class HostTest(object):
-    def __init__(self, path):
-        self.src_path = re.sub(r'\.pass\.cpp', '', path)
-        self.name = '{0}'.format(self.src_path)
-        self.path = '{0}/bin/libc++tests/{1}'.format(
-            os.getenv('ANDROID_HOST_OUT'), self.name)
-
-    def run(self):
-        return subprocess.call(['timeout', '30', self.path],
-                       stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-
-class DeviceTest(object):
-    def __init__(self, path):
-        self.src_path = re.sub(r'\.pass\.cpp', '', path)
-        self.name = '{0}'.format(self.src_path)
-        self.path = '/system/bin/libc++tests/{0}'.format(self.name)
-
-    def run(self):
-        return adb_shell(self.path)
-
-
-def adb_shell(command):
-    proc = subprocess.Popen(['timeout', '30',
-        'adb', 'shell', '{0}; echo $? 2>&1'.format(command)],
-        stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    out, err = proc.communicate()
-    proc.wait()
-    if proc.returncode:
-        return proc.returncode
-    out = [x for x in out.split('\r\n') if x]
-    return int(out[-1])
-
-
-def get_all_tests(subdir):
-    tests = {'host': [], 'device': []}
-    for path, _dirs, files in os.walk(subdir):
-        path = os.path.normpath(path)
-        if path == '.':
-            path = ''
-        for test in [t for t in files if t.endswith('.pass.cpp')]:
-            tests['host'].append(HostTest(os.path.join(path, test)))
-            tests['device'].append(DeviceTest(os.path.join(path, test)))
-    return tests
-
-
-def get_tests_in_subdirs(subdirs):
-    tests = {'host': [], 'device': []}
-    for subdir in subdirs:
-        subdir_tests = get_all_tests(subdir=subdir)
-        tests['host'].extend(subdir_tests['host'])
-        tests['device'].extend(subdir_tests['device'])
-    return tests
-
-
-def run_tests(tests, num_threads):
-    pb = ProgressBarWrapper(maxval=len(tests))
-    pool = multiprocessing.Pool(num_threads)
-
-    pb.start()
-    results = pool.imap(pool_task, tests)
-    num_run = {'host': 0, 'device': 0}
-    failures = {'host': [], 'device': []}
-    for name, status, target in results:
-        num_run[target] += 1
-        if status:
-            failures[target].append(name)
-        pb.update(sum(num_run.values()))
-    pb.finish()
-    return {'num_run': num_run, 'failures': failures}
-
-
-def report_results(results):
-    num_run = results['num_run']
-    failures = results['failures']
-    failed_both = sorted(filter(
-        lambda x: x in failures['host'],
-        failures['device']))
-
-    for target, failed in failures.iteritems():
-        failed = [x for x in failed if x not in failed_both]
-        print '{0} tests run: {1}'.format(target, num_run[target])
-        print '{0} tests failed: {1}'.format(target, len(failed))
-        for failure in sorted(failed):
-            print '\t{0}'.format(failure)
-        print
-
-    if len(failed_both):
-        print '{0} tests failed in both environments'.format(len(failed_both))
-        for failure in failed_both:
-            print '\t{0}'.format(failure)
-
-
-def pool_task(test):
-    target = 'host' if isinstance(test, HostTest) else 'device'
-    #print '{0} run {1}'.format(target, test.name)
-    return (test.name, test.run(), target)
-
-
-def main():
-    try:
-        opts, args = getopt.getopt(
-                sys.argv[1:], 'n:t:', ['threads=', 'target='])
-    except getopt.GetoptError as err:
-        sys.exit(str(err))
-
-    subdirs = ['.']
-    target = 'both'
-    num_threads = multiprocessing.cpu_count() * 2
-    for opt, arg in opts:
-        if opt in ('-n', '--threads'):
-            num_threads = int(arg)
-        elif opt in ('-t', '--target'):
-            target = arg
-        else:
-            sys.exit('Unknown option {0}'.format(opt))
-
-    if len(args):
-        subdirs = args
-
-    tests = get_tests_in_subdirs(subdirs)
-    if target == 'both':
-        tests = tests['host'] + tests['device']
-    else:
-        tests = tests[target]
-
-    results = run_tests(tests, num_threads)
-    report_results(results)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/test/strings/Android.mk b/test/strings/Android.mk
deleted file mode 100644
index 2d2e59c..0000000
--- a/test/strings/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/Android.mk
-
-test_name := strings/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/strings/basic.string.hash/Android.mk b/test/strings/basic.string.hash/Android.mk
deleted file mode 100644
index 17ebf64..0000000
--- a/test/strings/basic.string.hash/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/basic.string.hash/Android.mk
-
-test_name := strings/basic.string.hash/strings
-test_src := strings.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/strings/basic.string.literals/Android.mk b/test/strings/basic.string.literals/Android.mk
deleted file mode 100644
index cf87b68..0000000
--- a/test/strings/basic.string.literals/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/strings/basic.string.literals/Android.mk
-
-test_name := strings/basic.string.literals/literal2
-test_src := literal2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string.literals/literal
-test_src := literal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string.literals/literal1
-test_src := literal1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string.literals/literal3
-test_src := literal3.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/strings/basic.string/Android.mk b/test/strings/basic.string/Android.mk
deleted file mode 100644
index 456eea4..0000000
--- a/test/strings/basic.string/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/basic.string/Android.mk
-
-test_name := strings/basic.string/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/strings/basic.string/string.access/Android.mk b/test/strings/basic.string/string.access/Android.mk
deleted file mode 100644
index d920156..0000000
--- a/test/strings/basic.string/string.access/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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/strings/basic.string/string.access/Android.mk
-
-test_name := strings/basic.string/string.access/db_front
-test_src := db_front.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.access/at
-test_src := at.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.access/db_cback
-test_src := db_cback.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.access/front
-test_src := front.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.access/back
-test_src := back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.access/db_cindex
-test_src := db_cindex.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.access/index
-test_src := index.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.access/db_back
-test_src := db_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.access/db_cfront
-test_src := db_cfront.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.access/db_index
-test_src := db_index.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/strings/basic.string/string.capacity/Android.mk b/test/strings/basic.string/string.capacity/Android.mk
deleted file mode 100644
index 292e165..0000000
--- a/test/strings/basic.string/string.capacity/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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/strings/basic.string/string.capacity/Android.mk
-
-test_name := strings/basic.string/string.capacity/length
-test_src := length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.capacity/resize_size_char
-test_src := resize_size_char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.capacity/shrink_to_fit
-test_src := shrink_to_fit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.capacity/clear
-test_src := clear.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.capacity/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.capacity/max_size
-test_src := max_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.capacity/capacity
-test_src := capacity.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.capacity/reserve
-test_src := reserve.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.capacity/empty
-test_src := empty.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.capacity/resize_size
-test_src := resize_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/strings/basic.string/string.cons/Android.mk b/test/strings/basic.string/string.cons/Android.mk
deleted file mode 100644
index 837bcdd..0000000
--- a/test/strings/basic.string/string.cons/Android.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# 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/strings/basic.string/string.cons/Android.mk
-
-test_name := strings/basic.string/string.cons/alloc
-test_src := alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/move_noexcept
-test_src := move_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/default_noexcept
-test_src := default_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/char_assignment
-test_src := char_assignment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/move_assign_noexcept
-test_src := move_assign_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/size_char_alloc
-test_src := size_char_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/copy_alloc
-test_src := copy_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/copy_assignment
-test_src := copy_assignment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/substr
-test_src := substr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/iter_alloc
-test_src := iter_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/initializer_list
-test_src := initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/pointer_alloc
-test_src := pointer_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/pointer_assignment
-test_src := pointer_assignment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/pointer_size_alloc
-test_src := pointer_size_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/dtor_noexcept
-test_src := dtor_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/initializer_list_assignment
-test_src := initializer_list_assignment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/move_assignment
-test_src := move_assignment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.cons/move_alloc
-test_src := move_alloc.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/strings/basic.string/string.iterators/Android.mk b/test/strings/basic.string/string.iterators/Android.mk
deleted file mode 100644
index d1c5d9e..0000000
--- a/test/strings/basic.string/string.iterators/Android.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# 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/strings/basic.string/string.iterators/Android.mk
-
-test_name := strings/basic.string/string.iterators/db_iterators_7
-test_src := db_iterators_7.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/cend
-test_src := cend.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/begin
-test_src := begin.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/db_iterators_5
-test_src := db_iterators_5.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/db_iterators_3
-test_src := db_iterators_3.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/crend
-test_src := crend.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/cbegin
-test_src := cbegin.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/crbegin
-test_src := crbegin.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/rend
-test_src := rend.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/iterators
-test_src := iterators.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/db_iterators_2
-test_src := db_iterators_2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/rbegin
-test_src := rbegin.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/db_iterators_8
-test_src := db_iterators_8.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/end
-test_src := end.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/db_iterators_4
-test_src := db_iterators_4.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.iterators/db_iterators_6
-test_src := db_iterators_6.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/strings/basic.string/string.modifiers/Android.mk b/test/strings/basic.string/string.modifiers/Android.mk
deleted file mode 100644
index 7cb16e0..0000000
--- a/test/strings/basic.string/string.modifiers/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/basic.string/string.modifiers/Android.mk
-
-test_name := strings/basic.string/string.modifiers/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/strings/basic.string/string.modifiers/string_append/Android.mk b/test/strings/basic.string/string.modifiers/string_append/Android.mk
deleted file mode 100644
index 5dc0235..0000000
--- a/test/strings/basic.string/string.modifiers/string_append/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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/strings/basic.string/string.modifiers/string_append/Android.mk
-
-test_name := strings/basic.string/string.modifiers/string_append/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_append/size_char
-test_src := size_char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_append/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_append/pointer_size
-test_src := pointer_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_append/iterator
-test_src := iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_append/push_back
-test_src := push_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_append/string_size_size
-test_src := string_size_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_append/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
diff --git a/test/strings/basic.string/string.modifiers/string_assign/Android.mk b/test/strings/basic.string/string.modifiers/string_assign/Android.mk
deleted file mode 100644
index 4258f3a..0000000
--- a/test/strings/basic.string/string.modifiers/string_assign/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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/strings/basic.string/string.modifiers/string_assign/Android.mk
-
-test_name := strings/basic.string/string.modifiers/string_assign/rv_string
-test_src := rv_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_assign/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_assign/size_char
-test_src := size_char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_assign/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_assign/pointer_size
-test_src := pointer_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_assign/iterator
-test_src := iterator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_assign/string_size_size
-test_src := string_size_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_assign/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
diff --git a/test/strings/basic.string/string.modifiers/string_copy/Android.mk b/test/strings/basic.string/string.modifiers/string_copy/Android.mk
deleted file mode 100644
index 7146d1e..0000000
--- a/test/strings/basic.string/string.modifiers/string_copy/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/basic.string/string.modifiers/string_copy/Android.mk
-
-test_name := strings/basic.string/string.modifiers/string_copy/copy
-test_src := 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/strings/basic.string/string.modifiers/string_erase/Android.mk b/test/strings/basic.string/string.modifiers/string_erase/Android.mk
deleted file mode 100644
index e96e758..0000000
--- a/test/strings/basic.string/string.modifiers/string_erase/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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/strings/basic.string/string.modifiers/string_erase/Android.mk
-
-test_name := strings/basic.string/string.modifiers/string_erase/iter_iter
-test_src := iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4
-test_src := erase_iter_iter_db4.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_erase/iter
-test_src := iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_erase/pop_back
-test_src := pop_back.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1
-test_src := erase_iter_iter_db1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3
-test_src := erase_iter_iter_db3.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_erase/erase_iter_db2
-test_src := erase_iter_db2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_erase/size_size
-test_src := size_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_erase/erase_iter_db1
-test_src := erase_iter_db1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2
-test_src := erase_iter_iter_db2.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/strings/basic.string/string.modifiers/string_insert/Android.mk b/test/strings/basic.string/string.modifiers/string_insert/Android.mk
deleted file mode 100644
index 914342d..0000000
--- a/test/strings/basic.string/string.modifiers/string_insert/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/strings/basic.string/string.modifiers/string_insert/Android.mk
-
-test_name := strings/basic.string/string.modifiers/string_insert/size_pointer
-test_src := size_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_insert/size_string_size_size
-test_src := size_string_size_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_insert/size_pointer_size
-test_src := size_pointer_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_insert/iter_iter_iter
-test_src := iter_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_insert/iter_initializer_list
-test_src := iter_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_insert/iter_char
-test_src := iter_char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_insert/size_string
-test_src := size_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_insert/iter_size_char
-test_src := iter_size_char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_insert/size_size_char
-test_src := size_size_char.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/strings/basic.string/string.modifiers/string_op_plus_equal/Android.mk b/test/strings/basic.string/string.modifiers/string_op_plus_equal/Android.mk
deleted file mode 100644
index 65e6300..0000000
--- a/test/strings/basic.string/string.modifiers/string_op_plus_equal/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/strings/basic.string/string.modifiers/string_op_plus_equal/Android.mk
-
-test_name := strings/basic.string/string.modifiers/string_op_plus_equal/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_op_plus_equal/char
-test_src := char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_op_plus_equal/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_op_plus_equal/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
diff --git a/test/strings/basic.string/string.modifiers/string_replace/Android.mk b/test/strings/basic.string/string.modifiers/string_replace/Android.mk
deleted file mode 100644
index 23c583b..0000000
--- a/test/strings/basic.string/string.modifiers/string_replace/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# 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/strings/basic.string/string.modifiers/string_replace/Android.mk
-
-test_name := strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size
-test_src := iter_iter_pointer_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_replace/size_size_pointer
-test_src := size_size_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_replace/iter_iter_size_char
-test_src := iter_iter_size_char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_replace/iter_iter_string
-test_src := iter_iter_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_replace/size_size_pointer_size
-test_src := size_size_pointer_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_replace/size_size_string
-test_src := size_size_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter
-test_src := iter_iter_iter_iter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list
-test_src := iter_iter_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_replace/iter_iter_pointer
-test_src := iter_iter_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_replace/size_size_string_size_size
-test_src := size_size_string_size_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.modifiers/string_replace/size_size_size_char
-test_src := size_size_size_char.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/strings/basic.string/string.modifiers/string_swap/Android.mk b/test/strings/basic.string/string.modifiers/string_swap/Android.mk
deleted file mode 100644
index b2213fe..0000000
--- a/test/strings/basic.string/string.modifiers/string_swap/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/basic.string/string.modifiers/string_swap/Android.mk
-
-test_name := strings/basic.string/string.modifiers/string_swap/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/strings/basic.string/string.nonmembers/Android.mk b/test/strings/basic.string/string.nonmembers/Android.mk
deleted file mode 100644
index faa8721..0000000
--- a/test/strings/basic.string/string.nonmembers/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/basic.string/string.nonmembers/Android.mk
-
-test_name := strings/basic.string/string.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/strings/basic.string/string.nonmembers/string.io/Android.mk b/test/strings/basic.string/string.nonmembers/string.io/Android.mk
deleted file mode 100644
index c9301e7..0000000
--- a/test/strings/basic.string/string.nonmembers/string.io/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/strings/basic.string/string.nonmembers/string.io/Android.mk
-
-test_name := strings/basic.string/string.nonmembers/string.io/get_line_delim_rv
-test_src := get_line_delim_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string.io/get_line_delim
-test_src := get_line_delim.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string.io/get_line_rv
-test_src := get_line_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string.io/stream_extract
-test_src := stream_extract.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string.io/stream_insert
-test_src := stream_insert.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string.io/get_line
-test_src := get_line.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/strings/basic.string/string.nonmembers/string.special/Android.mk b/test/strings/basic.string/string.nonmembers/string.special/Android.mk
deleted file mode 100644
index 5d9262b..0000000
--- a/test/strings/basic.string/string.nonmembers/string.special/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/strings/basic.string/string.nonmembers/string.special/Android.mk
-
-test_name := strings/basic.string/string.nonmembers/string.special/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string.special/swap_noexcept
-test_src := swap_noexcept.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/strings/basic.string/string.nonmembers/string_op\041=/Android.mk" "b/test/strings/basic.string/string.nonmembers/string_op\041=/Android.mk"
deleted file mode 100644
index d486f4e..0000000
--- "a/test/strings/basic.string/string.nonmembers/string_op\041=/Android.mk"
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/strings/basic.string/string.nonmembers/string_op!=/Android.mk
-
-test_name := strings/basic.string/string.nonmembers/string_op!=/pointer_string
-test_src := pointer_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_op!=/string_string
-test_src := string_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_op!=/string_pointer
-test_src := string_pointer.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/strings/basic.string/string.nonmembers/string_op+/Android.mk b/test/strings/basic.string/string.nonmembers/string_op+/Android.mk
deleted file mode 100644
index bb52d4a..0000000
--- a/test/strings/basic.string/string.nonmembers/string_op+/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/strings/basic.string/string.nonmembers/string_op+/Android.mk
-
-test_name := strings/basic.string/string.nonmembers/string_op+/string_char
-test_src := string_char.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_op+/pointer_string
-test_src := pointer_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_op+/string_string
-test_src := string_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_op+/string_pointer
-test_src := string_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_op+/char_string
-test_src := char_string.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/strings/basic.string/string.nonmembers/string_operator==/Android.mk b/test/strings/basic.string/string.nonmembers/string_operator==/Android.mk
deleted file mode 100644
index 445d3da..0000000
--- a/test/strings/basic.string/string.nonmembers/string_operator==/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/strings/basic.string/string.nonmembers/string_operator==/Android.mk
-
-test_name := strings/basic.string/string.nonmembers/string_operator==/pointer_string
-test_src := pointer_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_operator==/string_string
-test_src := string_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_operator==/string_pointer
-test_src := string_pointer.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/strings/basic.string/string.nonmembers/string_opgt/Android.mk b/test/strings/basic.string/string.nonmembers/string_opgt/Android.mk
deleted file mode 100644
index 6887a69..0000000
--- a/test/strings/basic.string/string.nonmembers/string_opgt/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/strings/basic.string/string.nonmembers/string_opgt/Android.mk
-
-test_name := strings/basic.string/string.nonmembers/string_opgt/pointer_string
-test_src := pointer_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_opgt/string_string
-test_src := string_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_opgt/string_pointer
-test_src := string_pointer.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/strings/basic.string/string.nonmembers/string_opgt=/Android.mk b/test/strings/basic.string/string.nonmembers/string_opgt=/Android.mk
deleted file mode 100644
index 8699e02..0000000
--- a/test/strings/basic.string/string.nonmembers/string_opgt=/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/strings/basic.string/string.nonmembers/string_opgt=/Android.mk
-
-test_name := strings/basic.string/string.nonmembers/string_opgt=/pointer_string
-test_src := pointer_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_opgt=/string_string
-test_src := string_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_opgt=/string_pointer
-test_src := string_pointer.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/strings/basic.string/string.nonmembers/string_oplt/Android.mk b/test/strings/basic.string/string.nonmembers/string_oplt/Android.mk
deleted file mode 100644
index 92723c5..0000000
--- a/test/strings/basic.string/string.nonmembers/string_oplt/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/strings/basic.string/string.nonmembers/string_oplt/Android.mk
-
-test_name := strings/basic.string/string.nonmembers/string_oplt/pointer_string
-test_src := pointer_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_oplt/string_string
-test_src := string_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_oplt/string_pointer
-test_src := string_pointer.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/strings/basic.string/string.nonmembers/string_oplt=/Android.mk b/test/strings/basic.string/string.nonmembers/string_oplt=/Android.mk
deleted file mode 100644
index df4f51d..0000000
--- a/test/strings/basic.string/string.nonmembers/string_oplt=/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/strings/basic.string/string.nonmembers/string_oplt=/Android.mk
-
-test_name := strings/basic.string/string.nonmembers/string_oplt=/pointer_string
-test_src := pointer_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_oplt=/string_string
-test_src := string_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.nonmembers/string_oplt=/string_pointer
-test_src := string_pointer.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/strings/basic.string/string.ops/Android.mk b/test/strings/basic.string/string.ops/Android.mk
deleted file mode 100644
index 2173ccb..0000000
--- a/test/strings/basic.string/string.ops/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/basic.string/string.ops/Android.mk
-
-test_name := strings/basic.string/string.ops/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/strings/basic.string/string.ops/string.accessors/Android.mk b/test/strings/basic.string/string.ops/string.accessors/Android.mk
deleted file mode 100644
index f71fa27..0000000
--- a/test/strings/basic.string/string.ops/string.accessors/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/strings/basic.string/string.ops/string.accessors/Android.mk
-
-test_name := strings/basic.string/string.ops/string.accessors/data
-test_src := data.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string.accessors/get_allocator
-test_src := get_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string.accessors/c_str
-test_src := c_str.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/strings/basic.string/string.ops/string_compare/Android.mk b/test/strings/basic.string/string.ops/string_compare/Android.mk
deleted file mode 100644
index baa4659..0000000
--- a/test/strings/basic.string/string.ops/string_compare/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/strings/basic.string/string.ops/string_compare/Android.mk
-
-test_name := strings/basic.string/string.ops/string_compare/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_compare/size_size_pointer
-test_src := size_size_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_compare/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_compare/size_size_pointer_size
-test_src := size_size_pointer_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_compare/size_size_string
-test_src := size_size_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_compare/size_size_string_size_size
-test_src := size_size_string_size_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/strings/basic.string/string.ops/string_find.first.not.of/Android.mk b/test/strings/basic.string/string.ops/string_find.first.not.of/Android.mk
deleted file mode 100644
index 5780b32..0000000
--- a/test/strings/basic.string/string.ops/string_find.first.not.of/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/strings/basic.string/string.ops/string_find.first.not.of/Android.mk
-
-test_name := strings/basic.string/string.ops/string_find.first.not.of/string_size
-test_src := string_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find.first.not.of/pointer_size
-test_src := pointer_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size
-test_src := pointer_size_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find.first.not.of/char_size
-test_src := char_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/strings/basic.string/string.ops/string_find.first.of/Android.mk b/test/strings/basic.string/string.ops/string_find.first.of/Android.mk
deleted file mode 100644
index 4ec05a3..0000000
--- a/test/strings/basic.string/string.ops/string_find.first.of/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/strings/basic.string/string.ops/string_find.first.of/Android.mk
-
-test_name := strings/basic.string/string.ops/string_find.first.of/string_size
-test_src := string_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find.first.of/pointer_size
-test_src := pointer_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find.first.of/pointer_size_size
-test_src := pointer_size_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find.first.of/char_size
-test_src := char_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/strings/basic.string/string.ops/string_find.last.not.of/Android.mk b/test/strings/basic.string/string.ops/string_find.last.not.of/Android.mk
deleted file mode 100644
index 4d12ae7..0000000
--- a/test/strings/basic.string/string.ops/string_find.last.not.of/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/strings/basic.string/string.ops/string_find.last.not.of/Android.mk
-
-test_name := strings/basic.string/string.ops/string_find.last.not.of/string_size
-test_src := string_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find.last.not.of/pointer_size
-test_src := pointer_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size
-test_src := pointer_size_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find.last.not.of/char_size
-test_src := char_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/strings/basic.string/string.ops/string_find.last.of/Android.mk b/test/strings/basic.string/string.ops/string_find.last.of/Android.mk
deleted file mode 100644
index e1259d2..0000000
--- a/test/strings/basic.string/string.ops/string_find.last.of/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/strings/basic.string/string.ops/string_find.last.of/Android.mk
-
-test_name := strings/basic.string/string.ops/string_find.last.of/string_size
-test_src := string_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find.last.of/pointer_size
-test_src := pointer_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find.last.of/pointer_size_size
-test_src := pointer_size_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find.last.of/char_size
-test_src := char_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/strings/basic.string/string.ops/string_find/Android.mk b/test/strings/basic.string/string.ops/string_find/Android.mk
deleted file mode 100644
index 5a56952..0000000
--- a/test/strings/basic.string/string.ops/string_find/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/strings/basic.string/string.ops/string_find/Android.mk
-
-test_name := strings/basic.string/string.ops/string_find/string_size
-test_src := string_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find/pointer_size
-test_src := pointer_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find/pointer_size_size
-test_src := pointer_size_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_find/char_size
-test_src := char_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/strings/basic.string/string.ops/string_rfind/Android.mk b/test/strings/basic.string/string.ops/string_rfind/Android.mk
deleted file mode 100644
index 10e9449..0000000
--- a/test/strings/basic.string/string.ops/string_rfind/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/strings/basic.string/string.ops/string_rfind/Android.mk
-
-test_name := strings/basic.string/string.ops/string_rfind/string_size
-test_src := string_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_rfind/pointer_size
-test_src := pointer_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_rfind/pointer_size_size
-test_src := pointer_size_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/basic.string/string.ops/string_rfind/char_size
-test_src := char_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/strings/basic.string/string.ops/string_substr/Android.mk b/test/strings/basic.string/string.ops/string_substr/Android.mk
deleted file mode 100644
index 0d0e6d8..0000000
--- a/test/strings/basic.string/string.ops/string_substr/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/basic.string/string.ops/string_substr/Android.mk
-
-test_name := strings/basic.string/string.ops/string_substr/substr
-test_src := substr.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/strings/basic.string/string.require/Android.mk b/test/strings/basic.string/string.require/Android.mk
deleted file mode 100644
index f520d42..0000000
--- a/test/strings/basic.string/string.require/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/basic.string/string.require/Android.mk
-
-test_name := strings/basic.string/string.require/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/strings/c.strings/Android.mk b/test/strings/c.strings/Android.mk
deleted file mode 100644
index 638e61c..0000000
--- a/test/strings/c.strings/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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/strings/c.strings/Android.mk
-
-test_name := strings/c.strings/cctype
-test_src := cctype.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/c.strings/version_cwctype
-test_src := version_cwctype.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/c.strings/cwctype
-test_src := cwctype.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/c.strings/cwchar
-test_src := cwchar.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/c.strings/cstring
-test_src := cstring.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/c.strings/version_cwchar
-test_src := version_cwchar.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/c.strings/version_cctype
-test_src := version_cctype.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/c.strings/version_cstring
-test_src := version_cstring.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/test/strings/char.traits/Android.mk b/test/strings/char.traits/Android.mk
deleted file mode 100644
index 864cf3c..0000000
--- a/test/strings/char.traits/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/char.traits/Android.mk
-
-test_name := strings/char.traits/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/strings/char.traits/char.traits.require/Android.mk b/test/strings/char.traits/char.traits.require/Android.mk
deleted file mode 100644
index 27959e0..0000000
--- a/test/strings/char.traits/char.traits.require/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/char.traits/char.traits.require/Android.mk
-
-test_name := strings/char.traits/char.traits.require/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/strings/char.traits/char.traits.specializations/Android.mk b/test/strings/char.traits/char.traits.specializations/Android.mk
deleted file mode 100644
index c596daf..0000000
--- a/test/strings/char.traits/char.traits.specializations/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/char.traits/char.traits.specializations/Android.mk
-
-test_name := strings/char.traits/char.traits.specializations/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/strings/char.traits/char.traits.specializations/char.traits.specializations.char/Android.mk b/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/Android.mk
deleted file mode 100644
index 7679149..0000000
--- a/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/Android.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# 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/strings/char.traits/char.traits.specializations/char.traits.specializations.char/Android.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/length
-test_src := length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/compare
-test_src := compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/find
-test_src := find.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/lt
-test_src := lt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/not_eof
-test_src := not_eof.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign3
-test_src := assign3.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign2
-test_src := assign2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/to_int_type
-test_src := to_int_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/eq_int_type
-test_src := eq_int_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/to_char_type
-test_src := to_char_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/eq
-test_src := eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char/eof
-test_src := eof.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/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/Android.mk b/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/Android.mk
deleted file mode 100644
index 691de5d..0000000
--- a/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/Android.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# 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/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/Android.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length
-test_src := length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare
-test_src := compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find
-test_src := find.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt
-test_src := lt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof
-test_src := not_eof.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3
-test_src := assign3.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2
-test_src := assign2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type
-test_src := to_int_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type
-test_src := eq_int_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type
-test_src := to_char_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq
-test_src := eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eof
-test_src := eof.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/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/Android.mk b/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/Android.mk
deleted file mode 100644
index 1f7817b..0000000
--- a/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/Android.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# 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/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/Android.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length
-test_src := length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare
-test_src := compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find
-test_src := find.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt
-test_src := lt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof
-test_src := not_eof.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3
-test_src := assign3.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2
-test_src := assign2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type
-test_src := to_int_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type
-test_src := eq_int_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type
-test_src := to_char_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq
-test_src := eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eof
-test_src := eof.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/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/Android.mk b/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/Android.mk
deleted file mode 100644
index 287751e..0000000
--- a/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/Android.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# 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/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/Android.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/length
-test_src := length.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/compare
-test_src := compare.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/find
-test_src := find.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/lt
-test_src := lt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/not_eof
-test_src := not_eof.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign3
-test_src := assign3.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign2
-test_src := assign2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/to_int_type
-test_src := to_int_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eq_int_type
-test_src := eq_int_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/to_char_type
-test_src := to_char_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eq
-test_src := eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eof
-test_src := eof.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/strings/char.traits/char.traits.typedefs/Android.mk b/test/strings/char.traits/char.traits.typedefs/Android.mk
deleted file mode 100644
index cf4a776..0000000
--- a/test/strings/char.traits/char.traits.typedefs/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/char.traits/char.traits.typedefs/Android.mk
-
-test_name := strings/char.traits/char.traits.typedefs/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/strings/string.classes/Android.mk b/test/strings/string.classes/Android.mk
deleted file mode 100644
index 18411d9..0000000
--- a/test/strings/string.classes/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/string.classes/Android.mk
-
-test_name := strings/string.classes/typedefs
-test_src := typedefs.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/strings/string.conversions/Android.mk b/test/strings/string.conversions/Android.mk
deleted file mode 100644
index db1810a..0000000
--- a/test/strings/string.conversions/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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/strings/string.conversions/Android.mk
-
-test_name := strings/string.conversions/stod
-test_src := stod.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/string.conversions/stold
-test_src := stold.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/string.conversions/to_wstring
-test_src := to_wstring.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/string.conversions/stoul
-test_src := stoul.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/string.conversions/stol
-test_src := stol.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/string.conversions/stoll
-test_src := stoll.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/string.conversions/to_string
-test_src := to_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/string.conversions/stoull
-test_src := stoull.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/string.conversions/stof
-test_src := stof.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := strings/string.conversions/stoi
-test_src := stoi.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/strings/strings.general/Android.mk b/test/strings/strings.general/Android.mk
deleted file mode 100644
index 263cff3..0000000
--- a/test/strings/strings.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/strings/strings.general/Android.mk
-
-test_name := strings/strings.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/support/Android.mk b/test/support/Android.mk
deleted file mode 100644
index f8c802b..0000000
--- a/test/support/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/support/Android.mk
-
-test_name := support/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/thread/Android.mk b/test/thread/Android.mk
deleted file mode 100644
index 868981c..0000000
--- a/test/thread/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/Android.mk
-
-test_name := thread/macro
-test_src := macro.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/thread/futures/Android.mk b/test/thread/futures/Android.mk
deleted file mode 100644
index c5a83bc..0000000
--- a/test/thread/futures/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/futures/Android.mk
-
-test_name := thread/futures/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/thread/futures/futures.async/Android.mk b/test/thread/futures/futures.async/Android.mk
deleted file mode 100644
index 3225f84..0000000
--- a/test/thread/futures/futures.async/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/futures/futures.async/Android.mk
-
-test_name := thread/futures/futures.async/async
-test_src := async.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/thread/futures/futures.errors/Android.mk b/test/thread/futures/futures.errors/Android.mk
deleted file mode 100644
index b0a07ba..0000000
--- a/test/thread/futures/futures.errors/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/thread/futures/futures.errors/Android.mk
-
-test_name := thread/futures/futures.errors/future_category
-test_src := future_category.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.errors/make_error_condition
-test_src := make_error_condition.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.errors/equivalent_error_code_int
-test_src := equivalent_error_code_int.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.errors/default_error_condition
-test_src := default_error_condition.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.errors/make_error_code
-test_src := make_error_code.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.errors/equivalent_int_error_condition
-test_src := equivalent_int_error_condition.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/thread/futures/futures.future_error/Android.mk b/test/thread/futures/futures.future_error/Android.mk
deleted file mode 100644
index fb176a2..0000000
--- a/test/thread/futures/futures.future_error/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/thread/futures/futures.future_error/Android.mk
-
-test_name := thread/futures/futures.future_error/what
-test_src := what.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.future_error/code
-test_src := code.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.future_error/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/thread/futures/futures.overview/Android.mk b/test/thread/futures/futures.overview/Android.mk
deleted file mode 100644
index 6b42651..0000000
--- a/test/thread/futures/futures.overview/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/thread/futures/futures.overview/Android.mk
-
-test_name := thread/futures/futures.overview/future_errc
-test_src := future_errc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.overview/future_status
-test_src := future_status.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.overview/launch
-test_src := launch.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.overview/is_error_code_enum_future_errc
-test_src := is_error_code_enum_future_errc.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/thread/futures/futures.promise/Android.mk b/test/thread/futures/futures.promise/Android.mk
deleted file mode 100644
index ca7b44e..0000000
--- a/test/thread/futures/futures.promise/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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/thread/futures/futures.promise/Android.mk
-
-test_name := thread/futures/futures.promise/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/set_rvalue_at_thread_exit
-test_src := set_rvalue_at_thread_exit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/move_ctor
-test_src := move_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/set_rvalue
-test_src := set_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/set_lvalue_at_thread_exit
-test_src := set_lvalue_at_thread_exit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/get_future
-test_src := get_future.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/dtor
-test_src := dtor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/set_lvalue
-test_src := set_lvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/set_value_const
-test_src := set_value_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/set_value_at_thread_exit_void
-test_src := set_value_at_thread_exit_void.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/uses_allocator
-test_src := uses_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/set_value_at_thread_exit_const
-test_src := set_value_at_thread_exit_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/set_exception
-test_src := set_exception.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/move_assign
-test_src := move_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/alloc_ctor
-test_src := alloc_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/set_value_void
-test_src := set_value_void.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.promise/set_exception_at_thread_exit
-test_src := set_exception_at_thread_exit.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/thread/futures/futures.shared_future/Android.mk b/test/thread/futures/futures.shared_future/Android.mk
deleted file mode 100644
index fa348c6..0000000
--- a/test/thread/futures/futures.shared_future/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# 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/thread/futures/futures.shared_future/Android.mk
-
-test_name := thread/futures/futures.shared_future/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.shared_future/move_ctor
-test_src := move_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.shared_future/copy_ctor
-test_src := copy_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.shared_future/dtor
-test_src := dtor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.shared_future/wait_until
-test_src := wait_until.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.shared_future/get
-test_src := get.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.shared_future/wait
-test_src := wait.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.shared_future/ctor_future
-test_src := ctor_future.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.shared_future/move_assign
-test_src := move_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.shared_future/copy_assign
-test_src := copy_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.shared_future/wait_for
-test_src := wait_for.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/thread/futures/futures.state/Android.mk b/test/thread/futures/futures.state/Android.mk
deleted file mode 100644
index 8f3d5a9..0000000
--- a/test/thread/futures/futures.state/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/futures/futures.state/Android.mk
-
-test_name := thread/futures/futures.state/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/thread/futures/futures.tas/Android.mk b/test/thread/futures/futures.tas/Android.mk
deleted file mode 100644
index 1397465..0000000
--- a/test/thread/futures/futures.tas/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/futures/futures.tas/Android.mk
-
-test_name := thread/futures/futures.tas/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/thread/futures/futures.tas/futures.task.members/Android.mk b/test/thread/futures/futures.tas/futures.task.members/Android.mk
deleted file mode 100644
index 3ae15d5..0000000
--- a/test/thread/futures/futures.tas/futures.task.members/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# 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/thread/futures/futures.tas/futures.task.members/Android.mk
-
-test_name := thread/futures/futures.tas/futures.task.members/operator
-test_src := operator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.tas/futures.task.members/get_future
-test_src := get_future.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.tas/futures.task.members/dtor
-test_src := dtor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.tas/futures.task.members/ctor_func_alloc
-test_src := ctor_func_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.tas/futures.task.members/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit
-test_src := make_ready_at_thread_exit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.tas/futures.task.members/ctor_func
-test_src := ctor_func.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.tas/futures.task.members/reset
-test_src := reset.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.tas/futures.task.members/ctor_move
-test_src := ctor_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.tas/futures.task.members/assign_move
-test_src := assign_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.tas/futures.task.members/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/thread/futures/futures.tas/futures.task.nonmembers/Android.mk b/test/thread/futures/futures.tas/futures.task.nonmembers/Android.mk
deleted file mode 100644
index 6765cb9..0000000
--- a/test/thread/futures/futures.tas/futures.task.nonmembers/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/thread/futures/futures.tas/futures.task.nonmembers/Android.mk
-
-test_name := thread/futures/futures.tas/futures.task.nonmembers/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.tas/futures.task.nonmembers/uses_allocator
-test_src := uses_allocator.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/thread/futures/futures.unique_future/Android.mk b/test/thread/futures/futures.unique_future/Android.mk
deleted file mode 100644
index 5de375c..0000000
--- a/test/thread/futures/futures.unique_future/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/thread/futures/futures.unique_future/Android.mk
-
-test_name := thread/futures/futures.unique_future/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.unique_future/move_ctor
-test_src := move_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.unique_future/dtor
-test_src := dtor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.unique_future/wait_until
-test_src := wait_until.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.unique_future/share
-test_src := share.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.unique_future/get
-test_src := get.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.unique_future/wait
-test_src := wait.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.unique_future/move_assign
-test_src := move_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/futures/futures.unique_future/wait_for
-test_src := wait_for.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/thread/thread.condition/Android.mk b/test/thread/thread.condition/Android.mk
deleted file mode 100644
index e8e2506..0000000
--- a/test/thread/thread.condition/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/thread/thread.condition/Android.mk
-
-test_name := thread/thread.condition/notify_all_at_thread_exit
-test_src := notify_all_at_thread_exit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/cv_status
-test_src := cv_status.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/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/thread/thread.condition/thread.condition.condvar/Android.mk b/test/thread/thread.condition/thread.condition.condvar/Android.mk
deleted file mode 100644
index 6b7ca07..0000000
--- a/test/thread/thread.condition/thread.condition.condvar/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# 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/thread/thread.condition/thread.condition.condvar/Android.mk
-
-test_name := thread/thread.condition/thread.condition.condvar/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvar/notify_one
-test_src := notify_one.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvar/wait_until
-test_src := wait_until.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvar/destructor
-test_src := destructor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvar/wait
-test_src := wait.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvar/native_handle
-test_src := native_handle.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvar/wait_pred
-test_src := wait_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvar/wait_until_pred
-test_src := wait_until_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvar/notify_all
-test_src := notify_all.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvar/wait_for
-test_src := wait_for.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvar/wait_for_pred
-test_src := wait_for_pred.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/thread/thread.condition/thread.condition.condvarany/Android.mk b/test/thread/thread.condition/thread.condition.condvarany/Android.mk
deleted file mode 100644
index f81c8b9..0000000
--- a/test/thread/thread.condition/thread.condition.condvarany/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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/thread/thread.condition/thread.condition.condvarany/Android.mk
-
-test_name := thread/thread.condition/thread.condition.condvarany/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvarany/wait_for.exception
-test_src := wait_for.exception.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvarany/notify_one
-test_src := notify_one.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvarany/wait_until
-test_src := wait_until.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvarany/destructor
-test_src := destructor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvarany/wait
-test_src := wait.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvarany/wait_pred
-test_src := wait_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvarany/wait_until_pred
-test_src := wait_until_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvarany/notify_all
-test_src := notify_all.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvarany/wait_for
-test_src := wait_for.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvarany/wait_for_pred
-test_src := wait_for_pred.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.condition/thread.condition.condvarany/wait.exception
-test_src := wait.exception.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/thread/thread.general/Android.mk b/test/thread/thread.general/Android.mk
deleted file mode 100644
index 7f8f88b..0000000
--- a/test/thread/thread.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.general/Android.mk
-
-test_name := thread/thread.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/thread/thread.mutex/Android.mk b/test/thread/thread.mutex/Android.mk
deleted file mode 100644
index 591197d..0000000
--- a/test/thread/thread.mutex/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.mutex/Android.mk
-
-test_name := thread/thread.mutex/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/thread/thread.mutex/thread.lock.algorithm/Android.mk b/test/thread/thread.mutex/thread.lock.algorithm/Android.mk
deleted file mode 100644
index 1d68666..0000000
--- a/test/thread/thread.mutex/thread.lock.algorithm/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.lock.algorithm/Android.mk
-
-test_name := thread/thread.mutex/thread.lock.algorithm/lock
-test_src := lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock.algorithm/try_lock
-test_src := try_lock.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/thread/thread.mutex/thread.lock/Android.mk b/test/thread/thread.mutex/thread.lock/Android.mk
deleted file mode 100644
index 60ae42b..0000000
--- a/test/thread/thread.mutex/thread.lock/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.lock/Android.mk
-
-test_name := thread/thread.mutex/thread.lock/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/thread/thread.mutex/thread.lock/thread.lock.guard/Android.mk b/test/thread/thread.mutex/thread.lock/thread.lock.guard/Android.mk
deleted file mode 100644
index 1d3c146..0000000
--- a/test/thread/thread.mutex/thread.lock/thread.lock.guard/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.lock/thread.lock.guard/Android.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.guard/adopt_lock
-test_src := adopt_lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.guard/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.guard/mutex
-test_src := mutex.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/thread/thread.mutex/thread.lock/thread.lock.shared/Android.mk b/test/thread/thread.mutex/thread.lock/thread.lock.shared/Android.mk
deleted file mode 100644
index 1bc8ca5..0000000
--- a/test/thread/thread.mutex/thread.lock/thread.lock.shared/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.lock/thread.lock.shared/Android.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/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/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/Android.mk b/test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/Android.mk
deleted file mode 100644
index 9aa4e5a..0000000
--- a/test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/Android.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock
-test_src := mutex_adopt_lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_ctor
-test_src := move_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_try_to_lock
-test_src := mutex_try_to_lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_duration
-test_src := mutex_duration.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_time_point
-test_src := mutex_time_point.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_assign
-test_src := move_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex
-test_src := mutex.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_defer_lock
-test_src := mutex_defer_lock.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/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/Android.mk b/test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/Android.mk
deleted file mode 100644
index 0066d39..0000000
--- a/test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/Android.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock
-test_src := lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/unlock
-test_src := unlock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/try_lock_until
-test_src := try_lock_until.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/try_lock_for
-test_src := try_lock_for.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/try_lock
-test_src := try_lock.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/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.mod/Android.mk b/test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.mod/Android.mk
deleted file mode 100644
index d072723..0000000
--- a/test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.mod/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.mod/Android.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.mod/release
-test_src := release.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.mod/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.mod/nonmember_swap
-test_src := nonmember_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/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/Android.mk b/test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/Android.mk
deleted file mode 100644
index 63c4ab9..0000000
--- a/test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/Android.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/owns_lock
-test_src := owns_lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/mutex
-test_src := mutex.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/op_bool
-test_src := op_bool.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/thread/thread.mutex/thread.lock/thread.lock.unique/Android.mk b/test/thread/thread.mutex/thread.lock/thread.lock.unique/Android.mk
deleted file mode 100644
index e170830..0000000
--- a/test/thread/thread.mutex/thread.lock/thread.lock.unique/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.lock/thread.lock.unique/Android.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/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/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/Android.mk b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/Android.mk
deleted file mode 100644
index 6e58f61..0000000
--- a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/Android.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_adopt_lock
-test_src := mutex_adopt_lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor
-test_src := move_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_try_to_lock
-test_src := mutex_try_to_lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_duration
-test_src := mutex_duration.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_time_point
-test_src := mutex_time_point.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign
-test_src := move_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex
-test_src := mutex.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_defer_lock
-test_src := mutex_defer_lock.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/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/Android.mk b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/Android.mk
deleted file mode 100644
index 559a14d..0000000
--- a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/Android.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/lock
-test_src := lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/unlock
-test_src := unlock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock_until
-test_src := try_lock_until.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock_for
-test_src := try_lock_for.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock
-test_src := try_lock.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/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/Android.mk b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/Android.mk
deleted file mode 100644
index 829be9c..0000000
--- a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/Android.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/release
-test_src := release.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/member_swap
-test_src := member_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/nonmember_swap
-test_src := nonmember_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/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/Android.mk b/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/Android.mk
deleted file mode 100644
index 6617518..0000000
--- a/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/Android.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/owns_lock
-test_src := owns_lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/mutex
-test_src := mutex.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/op_bool
-test_src := op_bool.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/thread/thread.mutex/thread.mutex.requirements/Android.mk b/test/thread/thread.mutex/thread.mutex.requirements/Android.mk
deleted file mode 100644
index c4c9048..0000000
--- a/test/thread/thread.mutex/thread.mutex.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.mutex.requirements/Android.mk
-
-test_name := thread/thread.mutex/thread.mutex.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/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.general/Android.mk b/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.general/Android.mk
deleted file mode 100644
index a4b5b7d..0000000
--- a/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.general/Android.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.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/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/Android.mk b/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/Android.mk
deleted file mode 100644
index db1fe7d..0000000
--- a/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/Android.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/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/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/Android.mk b/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/Android.mk
deleted file mode 100644
index 6b8add3..0000000
--- a/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/Android.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/lock
-test_src := lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle
-test_src := native_handle.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/try_lock
-test_src := try_lock.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/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/Android.mk b/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/Android.mk
deleted file mode 100644
index edac77f..0000000
--- a/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/Android.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/lock
-test_src := lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/native_handle
-test_src := native_handle.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/try_lock
-test_src := try_lock.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/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/Android.mk b/test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/Android.mk
deleted file mode 100644
index 0f25b4f..0000000
--- a/test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/Android.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.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/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/Android.mk b/test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/Android.mk
deleted file mode 100644
index a7a955b..0000000
--- a/test/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/Android.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/lock
-test_src := lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/lock_shared
-test_src := lock_shared.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_until
-test_src := try_lock_until.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared_for
-test_src := try_lock_shared_for.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared_until
-test_src := try_lock_shared_until.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared
-test_src := try_lock_shared.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_for
-test_src := try_lock_for.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock
-test_src := try_lock.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/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/Android.mk b/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/Android.mk
deleted file mode 100644
index 929949c..0000000
--- a/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/Android.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.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/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/Android.mk b/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/Android.mk
deleted file mode 100644
index ba175f2..0000000
--- a/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/Android.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/lock
-test_src := lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_until
-test_src := try_lock_until.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_for
-test_src := try_lock_for.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock
-test_src := try_lock.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/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/Android.mk b/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/Android.mk
deleted file mode 100644
index 22cac24..0000000
--- a/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/Android.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/lock
-test_src := lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_until
-test_src := try_lock_until.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_for
-test_src := try_lock_for.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock
-test_src := try_lock.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/thread/thread.mutex/thread.once/Android.mk b/test/thread/thread.mutex/thread.once/Android.mk
deleted file mode 100644
index 808e444..0000000
--- a/test/thread/thread.mutex/thread.once/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.once/Android.mk
-
-test_name := thread/thread.mutex/thread.once/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/thread/thread.mutex/thread.once/thread.once.callonce/Android.mk b/test/thread/thread.mutex/thread.once/thread.once.callonce/Android.mk
deleted file mode 100644
index 8bc603d..0000000
--- a/test/thread/thread.mutex/thread.once/thread.once.callonce/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.once/thread.once.callonce/Android.mk
-
-test_name := thread/thread.mutex/thread.once/thread.once.callonce/call_once
-test_src := call_once.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/thread/thread.mutex/thread.once/thread.once.onceflag/Android.mk b/test/thread/thread.mutex/thread.once/thread.once.onceflag/Android.mk
deleted file mode 100644
index 531cf15..0000000
--- a/test/thread/thread.mutex/thread.once/thread.once.onceflag/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.mutex/thread.once/thread.once.onceflag/Android.mk
-
-test_name := thread/thread.mutex/thread.once/thread.once.onceflag/default
-test_src := 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/thread/thread.req/Android.mk b/test/thread/thread.req/Android.mk
deleted file mode 100644
index da0c997..0000000
--- a/test/thread/thread.req/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.req/Android.mk
-
-test_name := thread/thread.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/thread/thread.req/thread.req.exception/Android.mk b/test/thread/thread.req/thread.req.exception/Android.mk
deleted file mode 100644
index ea9af71..0000000
--- a/test/thread/thread.req/thread.req.exception/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.req/thread.req.exception/Android.mk
-
-test_name := thread/thread.req/thread.req.exception/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/thread/thread.req/thread.req.lockable/Android.mk b/test/thread/thread.req/thread.req.lockable/Android.mk
deleted file mode 100644
index 095b696..0000000
--- a/test/thread/thread.req/thread.req.lockable/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.req/thread.req.lockable/Android.mk
-
-test_name := thread/thread.req/thread.req.lockable/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/thread/thread.req/thread.req.lockable/thread.req.lockable.basic/Android.mk b/test/thread/thread.req/thread.req.lockable/thread.req.lockable.basic/Android.mk
deleted file mode 100644
index 6a57502..0000000
--- a/test/thread/thread.req/thread.req.lockable/thread.req.lockable.basic/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.req/thread.req.lockable/thread.req.lockable.basic/Android.mk
-
-test_name := thread/thread.req/thread.req.lockable/thread.req.lockable.basic/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/thread/thread.req/thread.req.lockable/thread.req.lockable.general/Android.mk b/test/thread/thread.req/thread.req.lockable/thread.req.lockable.general/Android.mk
deleted file mode 100644
index 01f82b7..0000000
--- a/test/thread/thread.req/thread.req.lockable/thread.req.lockable.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.req/thread.req.lockable/thread.req.lockable.general/Android.mk
-
-test_name := thread/thread.req/thread.req.lockable/thread.req.lockable.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/thread/thread.req/thread.req.lockable/thread.req.lockable.req/Android.mk b/test/thread/thread.req/thread.req.lockable/thread.req.lockable.req/Android.mk
deleted file mode 100644
index 08d71e3..0000000
--- a/test/thread/thread.req/thread.req.lockable/thread.req.lockable.req/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.req/thread.req.lockable/thread.req.lockable.req/Android.mk
-
-test_name := thread/thread.req/thread.req.lockable/thread.req.lockable.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/thread/thread.req/thread.req.lockable/thread.req.lockable.timed/Android.mk b/test/thread/thread.req/thread.req.lockable/thread.req.lockable.timed/Android.mk
deleted file mode 100644
index 369c603..0000000
--- a/test/thread/thread.req/thread.req.lockable/thread.req.lockable.timed/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.req/thread.req.lockable/thread.req.lockable.timed/Android.mk
-
-test_name := thread/thread.req/thread.req.lockable/thread.req.lockable.timed/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/thread/thread.req/thread.req.native/Android.mk b/test/thread/thread.req/thread.req.native/Android.mk
deleted file mode 100644
index 3b5d1c5..0000000
--- a/test/thread/thread.req/thread.req.native/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.req/thread.req.native/Android.mk
-
-test_name := thread/thread.req/thread.req.native/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/thread/thread.req/thread.req.paramname/Android.mk b/test/thread/thread.req/thread.req.paramname/Android.mk
deleted file mode 100644
index b52698b..0000000
--- a/test/thread/thread.req/thread.req.paramname/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.req/thread.req.paramname/Android.mk
-
-test_name := thread/thread.req/thread.req.paramname/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/thread/thread.req/thread.req.timing/Android.mk b/test/thread/thread.req/thread.req.timing/Android.mk
deleted file mode 100644
index 0dcf832..0000000
--- a/test/thread/thread.req/thread.req.timing/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.req/thread.req.timing/Android.mk
-
-test_name := thread/thread.req/thread.req.timing/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/thread/thread.threads/Android.mk b/test/thread/thread.threads/Android.mk
deleted file mode 100644
index 87dcb7f..0000000
--- a/test/thread/thread.threads/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.threads/Android.mk
-
-test_name := thread/thread.threads/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/thread/thread.threads/thread.thread.class/Android.mk b/test/thread/thread.threads/thread.thread.class/Android.mk
deleted file mode 100644
index d8c9c4a..0000000
--- a/test/thread/thread.threads/thread.thread.class/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.threads/thread.thread.class/Android.mk
-
-test_name := thread/thread.threads/thread.thread.class/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/thread/thread.threads/thread.thread.class/thread.thread.algorithm/Android.mk b/test/thread/thread.threads/thread.thread.class/thread.thread.algorithm/Android.mk
deleted file mode 100644
index 676afae..0000000
--- a/test/thread/thread.threads/thread.thread.class/thread.thread.algorithm/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.threads/thread.thread.class/thread.thread.algorithm/Android.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.algorithm/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/thread/thread.threads/thread.thread.class/thread.thread.assign/Android.mk b/test/thread/thread.threads/thread.thread.class/thread.thread.assign/Android.mk
deleted file mode 100644
index 1dc7345..0000000
--- a/test/thread/thread.threads/thread.thread.class/thread.thread.assign/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.threads/thread.thread.class/thread.thread.assign/Android.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.assign/move
-test_src := move.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/thread/thread.threads/thread.thread.class/thread.thread.constr/Android.mk b/test/thread/thread.threads/thread.thread.class/thread.thread.constr/Android.mk
deleted file mode 100644
index 5c0c05a..0000000
--- a/test/thread/thread.threads/thread.thread.class/thread.thread.constr/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/thread/thread.threads/thread.thread.class/thread.thread.constr/Android.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.constr/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.constr/F
-test_src := F.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.constr/move
-test_src := move.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/thread/thread.threads/thread.thread.class/thread.thread.destr/Android.mk b/test/thread/thread.threads/thread.thread.class/thread.thread.destr/Android.mk
deleted file mode 100644
index ee442bb..0000000
--- a/test/thread/thread.threads/thread.thread.class/thread.thread.destr/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.threads/thread.thread.class/thread.thread.destr/Android.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.destr/dtor
-test_src := dtor.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/thread/thread.threads/thread.thread.class/thread.thread.id/Android.mk b/test/thread/thread.threads/thread.thread.class/thread.thread.id/Android.mk
deleted file mode 100644
index 1805858..0000000
--- a/test/thread/thread.threads/thread.thread.class/thread.thread.id/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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/thread/thread.threads/thread.thread.class/thread.thread.id/Android.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.id/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.id/thread_id
-test_src := thread_id.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.id/lt
-test_src := lt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.id/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.id/assign
-test_src := assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.id/stream
-test_src := stream.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.id/eq
-test_src := 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/thread/thread.threads/thread.thread.class/thread.thread.member/Android.mk b/test/thread/thread.threads/thread.thread.class/thread.thread.member/Android.mk
deleted file mode 100644
index 8524493..0000000
--- a/test/thread/thread.threads/thread.thread.class/thread.thread.member/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/thread/thread.threads/thread.thread.class/thread.thread.member/Android.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.member/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.member/native_handle
-test_src := native_handle.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.member/detach
-test_src := detach.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.member/join
-test_src := join.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.member/get_id
-test_src := get_id.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.member/joinable
-test_src := joinable.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/thread/thread.threads/thread.thread.class/thread.thread.static/Android.mk b/test/thread/thread.threads/thread.thread.class/thread.thread.static/Android.mk
deleted file mode 100644
index 0038cfa..0000000
--- a/test/thread/thread.threads/thread.thread.class/thread.thread.static/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/thread/thread.threads/thread.thread.class/thread.thread.static/Android.mk
-
-test_name := thread/thread.threads/thread.thread.class/thread.thread.static/hardware_concurrency
-test_src := hardware_concurrency.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/thread/thread.threads/thread.thread.this/Android.mk b/test/thread/thread.threads/thread.thread.this/Android.mk
deleted file mode 100644
index 856df24..0000000
--- a/test/thread/thread.threads/thread.thread.this/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/thread/thread.threads/thread.thread.this/Android.mk
-
-test_name := thread/thread.threads/thread.thread.this/yield
-test_src := yield.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.this/sleep_until
-test_src := sleep_until.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.this/sleep_for
-test_src := sleep_for.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := thread/thread.threads/thread.thread.this/get_id
-test_src := get_id.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/utilities/Android.mk b/test/utilities/Android.mk
deleted file mode 100644
index 58f31c1..0000000
--- a/test/utilities/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/Android.mk
-
-test_name := utilities/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/utilities/allocator.adaptor/Android.mk b/test/utilities/allocator.adaptor/Android.mk
deleted file mode 100644
index 156254f..0000000
--- a/test/utilities/allocator.adaptor/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/allocator.adaptor/Android.mk
-
-test_name := utilities/allocator.adaptor/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/utilities/allocator.adaptor/allocator.adaptor.cnstr/Android.mk b/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/Android.mk
deleted file mode 100644
index 959d6bb..0000000
--- a/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/utilities/allocator.adaptor/allocator.adaptor.cnstr/Android.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.cnstr/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move
-test_src := converting_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs
-test_src := allocs.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.cnstr/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy
-test_src := converting_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/utilities/allocator.adaptor/allocator.adaptor.members/Android.mk b/test/utilities/allocator.adaptor/allocator.adaptor.members/Android.mk
deleted file mode 100644
index b16ac37..0000000
--- a/test/utilities/allocator.adaptor/allocator.adaptor.members/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/utilities/allocator.adaptor/allocator.adaptor.members/Android.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.members/construct
-test_src := construct.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator
-test_src := inner_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.members/allocate_size
-test_src := allocate_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint
-test_src := allocate_size_hint.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.members/destroy
-test_src := destroy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction
-test_src := select_on_container_copy_construction.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.members/max_size
-test_src := max_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator
-test_src := outer_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.members/deallocate
-test_src := deallocate.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/utilities/allocator.adaptor/allocator.adaptor.types/Android.mk b/test/utilities/allocator.adaptor/allocator.adaptor.types/Android.mk
deleted file mode 100644
index 2093467..0000000
--- a/test/utilities/allocator.adaptor/allocator.adaptor.types/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/utilities/allocator.adaptor/allocator.adaptor.types/Android.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type
-test_src := inner_allocator_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment
-test_src := propagate_on_container_copy_assignment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap
-test_src := propagate_on_container_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers
-test_src := allocator_pointers.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment
-test_src := propagate_on_container_move_assignment.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/utilities/allocator.adaptor/scoped.adaptor.operators/Android.mk b/test/utilities/allocator.adaptor/scoped.adaptor.operators/Android.mk
deleted file mode 100644
index 8ccf05a..0000000
--- a/test/utilities/allocator.adaptor/scoped.adaptor.operators/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/allocator.adaptor/scoped.adaptor.operators/Android.mk
-
-test_name := utilities/allocator.adaptor/scoped.adaptor.operators/eq
-test_src := 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/utilities/date.time/Android.mk b/test/utilities/date.time/Android.mk
deleted file mode 100644
index 477cabc..0000000
--- a/test/utilities/date.time/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/date.time/Android.mk
-
-test_name := utilities/date.time/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/utilities/function.objects/Android.mk b/test/utilities/function.objects/Android.mk
deleted file mode 100644
index 57f5d5c..0000000
--- a/test/utilities/function.objects/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/function.objects/Android.mk
-
-test_name := utilities/function.objects/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/utilities/function.objects/arithmetic.operations/Android.mk b/test/utilities/function.objects/arithmetic.operations/Android.mk
deleted file mode 100644
index 7937781..0000000
--- a/test/utilities/function.objects/arithmetic.operations/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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/utilities/function.objects/arithmetic.operations/Android.mk
-
-test_name := utilities/function.objects/arithmetic.operations/divides
-test_src := divides.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/arithmetic.operations/transparent
-test_src := transparent.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/arithmetic.operations/negate
-test_src := negate.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/arithmetic.operations/modulus
-test_src := modulus.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/arithmetic.operations/minus
-test_src := minus.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/arithmetic.operations/plus
-test_src := plus.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/arithmetic.operations/multiplies
-test_src := multiplies.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/utilities/function.objects/bind/Android.mk b/test/utilities/function.objects/bind/Android.mk
deleted file mode 100644
index a1868ec..0000000
--- a/test/utilities/function.objects/bind/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/function.objects/bind/Android.mk
-
-test_name := utilities/function.objects/bind/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/utilities/function.objects/bind/func.bind/Android.mk b/test/utilities/function.objects/bind/func.bind/Android.mk
deleted file mode 100644
index bb1e1f5..0000000
--- a/test/utilities/function.objects/bind/func.bind/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/function.objects/bind/func.bind/Android.mk
-
-test_name := utilities/function.objects/bind/func.bind/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/utilities/function.objects/bind/func.bind/func.bind.bind/Android.mk b/test/utilities/function.objects/bind/func.bind/func.bind.bind/Android.mk
deleted file mode 100644
index fab6fec..0000000
--- a/test/utilities/function.objects/bind/func.bind/func.bind.bind/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/utilities/function.objects/bind/func.bind/func.bind.bind/Android.mk
-
-test_name := utilities/function.objects/bind/func.bind/func.bind.bind/invoke_lvalue
-test_src := invoke_lvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/bind/func.bind/func.bind.bind/invoke_int_0
-test_src := invoke_int_0.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/bind/func.bind/func.bind.bind/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/bind/func.bind/func.bind.bind/invoke_rvalue
-test_src := invoke_rvalue.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/bind/func.bind/func.bind.bind/invoke_void_0
-test_src := invoke_void_0.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/bind/func.bind/func.bind.bind/nested
-test_src := nested.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/utilities/function.objects/bind/func.bind/func.bind.isbind/Android.mk b/test/utilities/function.objects/bind/func.bind/func.bind.isbind/Android.mk
deleted file mode 100644
index 8b315c6..0000000
--- a/test/utilities/function.objects/bind/func.bind/func.bind.isbind/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/function.objects/bind/func.bind/func.bind.isbind/Android.mk
-
-test_name := utilities/function.objects/bind/func.bind/func.bind.isbind/is_bind_expression
-test_src := is_bind_expression.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/bind/func.bind/func.bind.isbind/is_placeholder
-test_src := is_placeholder.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/utilities/function.objects/bind/func.bind/func.bind.place/Android.mk b/test/utilities/function.objects/bind/func.bind/func.bind.place/Android.mk
deleted file mode 100644
index 49588d7..0000000
--- a/test/utilities/function.objects/bind/func.bind/func.bind.place/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/function.objects/bind/func.bind/func.bind.place/Android.mk
-
-test_name := utilities/function.objects/bind/func.bind/func.bind.place/placeholders
-test_src := placeholders.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/utilities/function.objects/bitwise.operations/Android.mk b/test/utilities/function.objects/bitwise.operations/Android.mk
deleted file mode 100644
index 75c94d0..0000000
--- a/test/utilities/function.objects/bitwise.operations/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/utilities/function.objects/bitwise.operations/Android.mk
-
-test_name := utilities/function.objects/bitwise.operations/bit_not
-test_src := bit_not.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/bitwise.operations/bit_and
-test_src := bit_and.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/bitwise.operations/transparent
-test_src := transparent.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/bitwise.operations/bit_xor
-test_src := bit_xor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/bitwise.operations/bit_or
-test_src := bit_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/utilities/function.objects/comparisons/Android.mk b/test/utilities/function.objects/comparisons/Android.mk
deleted file mode 100644
index 4d774a3..0000000
--- a/test/utilities/function.objects/comparisons/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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/utilities/function.objects/comparisons/Android.mk
-
-test_name := utilities/function.objects/comparisons/less
-test_src := less.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/comparisons/not_equal_to
-test_src := not_equal_to.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/comparisons/greater_equal
-test_src := greater_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/comparisons/less_equal
-test_src := less_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/comparisons/transparent
-test_src := transparent.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/comparisons/equal_to
-test_src := equal_to.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/comparisons/greater
-test_src := greater.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/utilities/function.objects/func.def/Android.mk b/test/utilities/function.objects/func.def/Android.mk
deleted file mode 100644
index e350232..0000000
--- a/test/utilities/function.objects/func.def/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/function.objects/func.def/Android.mk
-
-test_name := utilities/function.objects/func.def/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/utilities/function.objects/func.memfn/Android.mk b/test/utilities/function.objects/func.memfn/Android.mk
deleted file mode 100644
index af9aacc..0000000
--- a/test/utilities/function.objects/func.memfn/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/utilities/function.objects/func.memfn/Android.mk
-
-test_name := utilities/function.objects/func.memfn/member_data
-test_src := member_data.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.memfn/member_function_const
-test_src := member_function_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.memfn/member_function_volatile
-test_src := member_function_volatile.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.memfn/member_function
-test_src := member_function.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.memfn/member_function_const_volatile
-test_src := member_function_const_volatile.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/utilities/function.objects/func.require/Android.mk b/test/utilities/function.objects/func.require/Android.mk
deleted file mode 100644
index 6846fcb..0000000
--- a/test/utilities/function.objects/func.require/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/function.objects/func.require/Android.mk
-
-test_name := utilities/function.objects/func.require/unary_function
-test_src := unary_function.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.require/binary_function
-test_src := binary_function.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.require/invoke
-test_src := invoke.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/utilities/function.objects/func.wrap/Android.mk b/test/utilities/function.objects/func.wrap/Android.mk
deleted file mode 100644
index c0d6e2b..0000000
--- a/test/utilities/function.objects/func.wrap/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/function.objects/func.wrap/Android.mk
-
-test_name := utilities/function.objects/func.wrap/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/utilities/function.objects/func.wrap/func.wrap.badcall/Android.mk b/test/utilities/function.objects/func.wrap/func.wrap.badcall/Android.mk
deleted file mode 100644
index 3260516..0000000
--- a/test/utilities/function.objects/func.wrap/func.wrap.badcall/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/function.objects/func.wrap/func.wrap.badcall/Android.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.badcall/bad_function_call
-test_src := bad_function_call.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/utilities/function.objects/func.wrap/func.wrap.badcall/func.wrap.badcall.const/Android.mk b/test/utilities/function.objects/func.wrap/func.wrap.badcall/func.wrap.badcall.const/Android.mk
deleted file mode 100644
index c7d8457..0000000
--- a/test/utilities/function.objects/func.wrap/func.wrap.badcall/func.wrap.badcall.const/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/function.objects/func.wrap/func.wrap.badcall/func.wrap.badcall.const/Android.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.badcall/func.wrap.badcall.const/bad_function_call_ctor
-test_src := bad_function_call_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/utilities/function.objects/func.wrap/func.wrap.func/Android.mk b/test/utilities/function.objects/func.wrap/func.wrap.func/Android.mk
deleted file mode 100644
index 166aba0..0000000
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/function.objects/func.wrap/func.wrap.func/Android.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/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/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/Android.mk b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/Android.mk
deleted file mode 100644
index 5e057a5..0000000
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/Android.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/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/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.cap/Android.mk b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.cap/Android.mk
deleted file mode 100644
index e09f848..0000000
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.cap/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.cap/Android.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.cap/operator_bool
-test_src := operator_bool.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/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/Android.mk b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/Android.mk
deleted file mode 100644
index 5b81b32..0000000
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/Android.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# 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/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/Android.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc
-test_src := alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_incomplete
-test_src := F_incomplete.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign
-test_src := F_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F
-test_src := F.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction
-test_src := alloc_rfunction.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign
-test_src := nullptr_t_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr
-test_src := alloc_nullptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign
-test_src := copy_assign.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function
-test_src := alloc_function.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F
-test_src := alloc_F.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t
-test_src := nullptr_t.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/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/Android.mk b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/Android.mk
deleted file mode 100644
index 2cc2618..0000000
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/Android.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke_int_0
-test_src := invoke_int_0.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke_void_0
-test_src := invoke_void_0.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke
-test_src := invoke.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/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/Android.mk b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/Android.mk
deleted file mode 100644
index d1f9d9c..0000000
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/Android.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc
-test_src := assign_F_alloc.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/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.nullptr/Android.mk b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.nullptr/Android.mk
deleted file mode 100644
index 736e86c..0000000
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.nullptr/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.nullptr/Android.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.nullptr/operator_==
-test_src := operator_==.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/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/Android.mk b/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/Android.mk
deleted file mode 100644
index 677ef8f..0000000
--- a/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/Android.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target_type
-test_src := target_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target
-test_src := target.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/utilities/function.objects/logical.operations/Android.mk b/test/utilities/function.objects/logical.operations/Android.mk
deleted file mode 100644
index db6c1d8..0000000
--- a/test/utilities/function.objects/logical.operations/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/function.objects/logical.operations/Android.mk
-
-test_name := utilities/function.objects/logical.operations/logical_or
-test_src := logical_or.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/logical.operations/logical_and
-test_src := logical_and.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/logical.operations/logical_not
-test_src := logical_not.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/logical.operations/transparent
-test_src := transparent.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/utilities/function.objects/negators/Android.mk b/test/utilities/function.objects/negators/Android.mk
deleted file mode 100644
index a138986..0000000
--- a/test/utilities/function.objects/negators/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/function.objects/negators/Android.mk
-
-test_name := utilities/function.objects/negators/not1
-test_src := not1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/negators/unary_negate
-test_src := unary_negate.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/negators/binary_negate
-test_src := binary_negate.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/negators/not2
-test_src := not2.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/utilities/function.objects/refwrap/Android.mk b/test/utilities/function.objects/refwrap/Android.mk
deleted file mode 100644
index 0393a16..0000000
--- a/test/utilities/function.objects/refwrap/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/function.objects/refwrap/Android.mk
-
-test_name := utilities/function.objects/refwrap/binary
-test_src := binary.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/refwrap/type
-test_src := type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/refwrap/unary
-test_src := unary.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/refwrap/weak_result
-test_src := weak_result.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/utilities/function.objects/refwrap/refwrap.access/Android.mk b/test/utilities/function.objects/refwrap/refwrap.access/Android.mk
deleted file mode 100644
index 7225a60..0000000
--- a/test/utilities/function.objects/refwrap/refwrap.access/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/function.objects/refwrap/refwrap.access/Android.mk
-
-test_name := utilities/function.objects/refwrap/refwrap.access/conversion
-test_src := conversion.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/utilities/function.objects/refwrap/refwrap.assign/Android.mk b/test/utilities/function.objects/refwrap/refwrap.assign/Android.mk
deleted file mode 100644
index 5f5f7f8..0000000
--- a/test/utilities/function.objects/refwrap/refwrap.assign/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/function.objects/refwrap/refwrap.assign/Android.mk
-
-test_name := utilities/function.objects/refwrap/refwrap.assign/copy_assign
-test_src := copy_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/utilities/function.objects/refwrap/refwrap.const/Android.mk b/test/utilities/function.objects/refwrap/refwrap.const/Android.mk
deleted file mode 100644
index 75d6370..0000000
--- a/test/utilities/function.objects/refwrap/refwrap.const/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/function.objects/refwrap/refwrap.const/Android.mk
-
-test_name := utilities/function.objects/refwrap/refwrap.const/copy_ctor
-test_src := copy_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/refwrap/refwrap.const/type_ctor
-test_src := type_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/utilities/function.objects/refwrap/refwrap.helpers/Android.mk b/test/utilities/function.objects/refwrap/refwrap.helpers/Android.mk
deleted file mode 100644
index 2d1f3ea..0000000
--- a/test/utilities/function.objects/refwrap/refwrap.helpers/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/function.objects/refwrap/refwrap.helpers/Android.mk
-
-test_name := utilities/function.objects/refwrap/refwrap.helpers/cref_2
-test_src := cref_2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/refwrap/refwrap.helpers/cref_1
-test_src := cref_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/refwrap/refwrap.helpers/ref_1
-test_src := ref_1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/refwrap/refwrap.helpers/ref_2
-test_src := ref_2.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/utilities/function.objects/refwrap/refwrap.invoke/Android.mk b/test/utilities/function.objects/refwrap/refwrap.invoke/Android.mk
deleted file mode 100644
index dabac28..0000000
--- a/test/utilities/function.objects/refwrap/refwrap.invoke/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/function.objects/refwrap/refwrap.invoke/Android.mk
-
-test_name := utilities/function.objects/refwrap/refwrap.invoke/invoke_int_0
-test_src := invoke_int_0.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/refwrap/refwrap.invoke/invoke_void_0
-test_src := invoke_void_0.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/refwrap/refwrap.invoke/invoke
-test_src := invoke.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/utilities/function.objects/unord.hash/Android.mk b/test/utilities/function.objects/unord.hash/Android.mk
deleted file mode 100644
index b00b3d2..0000000
--- a/test/utilities/function.objects/unord.hash/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/function.objects/unord.hash/Android.mk
-
-test_name := utilities/function.objects/unord.hash/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/unord.hash/enum
-test_src := enum.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/unord.hash/floating
-test_src := floating.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/function.objects/unord.hash/integral
-test_src := integral.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/utilities/intseq/Android.mk b/test/utilities/intseq/Android.mk
deleted file mode 100644
index cf08ae4..0000000
--- a/test/utilities/intseq/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/intseq/Android.mk
-
-test_name := utilities/intseq/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/utilities/intseq/intseq.general/Android.mk b/test/utilities/intseq/intseq.general/Android.mk
deleted file mode 100644
index a44ebf5..0000000
--- a/test/utilities/intseq/intseq.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/intseq/intseq.general/Android.mk
-
-test_name := utilities/intseq/intseq.general/integer_seq
-test_src := integer_seq.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/utilities/intseq/intseq.intseq/Android.mk b/test/utilities/intseq/intseq.intseq/Android.mk
deleted file mode 100644
index 358f22d..0000000
--- a/test/utilities/intseq/intseq.intseq/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/intseq/intseq.intseq/Android.mk
-
-test_name := utilities/intseq/intseq.intseq/integer_seq
-test_src := integer_seq.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/utilities/intseq/intseq.make/Android.mk b/test/utilities/intseq/intseq.make/Android.mk
deleted file mode 100644
index 5c609de..0000000
--- a/test/utilities/intseq/intseq.make/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/intseq/intseq.make/Android.mk
-
-test_name := utilities/intseq/intseq.make/make_integer_seq
-test_src := make_integer_seq.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/utilities/memory/Android.mk b/test/utilities/memory/Android.mk
deleted file mode 100644
index 9ce5204..0000000
--- a/test/utilities/memory/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/Android.mk
-
-test_name := utilities/memory/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/utilities/memory/allocator.tag/Android.mk b/test/utilities/memory/allocator.tag/Android.mk
deleted file mode 100644
index 7223a7b..0000000
--- a/test/utilities/memory/allocator.tag/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/allocator.tag/Android.mk
-
-test_name := utilities/memory/allocator.tag/allocator_arg
-test_src := allocator_arg.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/utilities/memory/allocator.traits/Android.mk b/test/utilities/memory/allocator.traits/Android.mk
deleted file mode 100644
index 50edec5..0000000
--- a/test/utilities/memory/allocator.traits/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/memory/allocator.traits/Android.mk
-
-test_name := utilities/memory/allocator.traits/rebind_traits
-test_src := rebind_traits.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator_type
-test_src := allocator_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/value_type
-test_src := value_type.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/utilities/memory/allocator.traits/allocator.traits.members/Android.mk b/test/utilities/memory/allocator.traits/allocator.traits.members/Android.mk
deleted file mode 100644
index de46802..0000000
--- a/test/utilities/memory/allocator.traits/allocator.traits.members/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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/utilities/memory/allocator.traits/allocator.traits.members/Android.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.members/construct
-test_src := construct.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.members/allocate_hint
-test_src := allocate_hint.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.members/allocate
-test_src := allocate.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.members/destroy
-test_src := destroy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.members/select_on_container_copy_construction
-test_src := select_on_container_copy_construction.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.members/max_size
-test_src := max_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.members/deallocate
-test_src := deallocate.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/utilities/memory/allocator.traits/allocator.traits.types/Android.mk b/test/utilities/memory/allocator.traits/allocator.traits.types/Android.mk
deleted file mode 100644
index 8722186..0000000
--- a/test/utilities/memory/allocator.traits/allocator.traits.types/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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/utilities/memory/allocator.traits/allocator.traits.types/Android.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.types/size_type
-test_src := size_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.types/difference_type
-test_src := difference_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.types/const_pointer
-test_src := const_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.types/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_copy_assignment
-test_src := propagate_on_container_copy_assignment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_swap
-test_src := propagate_on_container_swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.types/rebind_alloc
-test_src := rebind_alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.types/void_pointer
-test_src := void_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_move_assignment
-test_src := propagate_on_container_move_assignment.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/allocator.traits/allocator.traits.types/const_void_pointer
-test_src := const_void_pointer.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/utilities/memory/allocator.uses/Android.mk b/test/utilities/memory/allocator.uses/Android.mk
deleted file mode 100644
index 9cbdce5..0000000
--- a/test/utilities/memory/allocator.uses/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/allocator.uses/Android.mk
-
-test_name := utilities/memory/allocator.uses/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/utilities/memory/allocator.uses/allocator.uses.construction/Android.mk b/test/utilities/memory/allocator.uses/allocator.uses.construction/Android.mk
deleted file mode 100644
index feeb6e3..0000000
--- a/test/utilities/memory/allocator.uses/allocator.uses.construction/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/allocator.uses/allocator.uses.construction/Android.mk
-
-test_name := utilities/memory/allocator.uses/allocator.uses.construction/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/utilities/memory/allocator.uses/allocator.uses.trait/Android.mk b/test/utilities/memory/allocator.uses/allocator.uses.trait/Android.mk
deleted file mode 100644
index 89ddc5d..0000000
--- a/test/utilities/memory/allocator.uses/allocator.uses.trait/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/allocator.uses/allocator.uses.trait/Android.mk
-
-test_name := utilities/memory/allocator.uses/allocator.uses.trait/uses_allocator
-test_src := uses_allocator.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/utilities/memory/c.malloc/Android.mk b/test/utilities/memory/c.malloc/Android.mk
deleted file mode 100644
index e806f72..0000000
--- a/test/utilities/memory/c.malloc/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/c.malloc/Android.mk
-
-test_name := utilities/memory/c.malloc/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/utilities/memory/default.allocator/Android.mk b/test/utilities/memory/default.allocator/Android.mk
deleted file mode 100644
index 4c711a7..0000000
--- a/test/utilities/memory/default.allocator/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/memory/default.allocator/Android.mk
-
-test_name := utilities/memory/default.allocator/allocator_types
-test_src := allocator_types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/default.allocator/allocator_pointers
-test_src := allocator_pointers.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/default.allocator/allocator_void
-test_src := allocator_void.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/utilities/memory/default.allocator/allocator.globals/Android.mk b/test/utilities/memory/default.allocator/allocator.globals/Android.mk
deleted file mode 100644
index a754c52..0000000
--- a/test/utilities/memory/default.allocator/allocator.globals/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/default.allocator/allocator.globals/Android.mk
-
-test_name := utilities/memory/default.allocator/allocator.globals/eq
-test_src := 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/utilities/memory/default.allocator/allocator.members/Android.mk b/test/utilities/memory/default.allocator/allocator.members/Android.mk
deleted file mode 100644
index 5983dee..0000000
--- a/test/utilities/memory/default.allocator/allocator.members/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/memory/default.allocator/allocator.members/Android.mk
-
-test_name := utilities/memory/default.allocator/allocator.members/address
-test_src := address.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/default.allocator/allocator.members/construct
-test_src := construct.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/default.allocator/allocator.members/allocate
-test_src := allocate.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/default.allocator/allocator.members/max_size
-test_src := max_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/utilities/memory/pointer.traits/Android.mk b/test/utilities/memory/pointer.traits/Android.mk
deleted file mode 100644
index b57db8b..0000000
--- a/test/utilities/memory/pointer.traits/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/utilities/memory/pointer.traits/Android.mk
-
-test_name := utilities/memory/pointer.traits/rebind
-test_src := rebind.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/pointer.traits/difference_type
-test_src := difference_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/pointer.traits/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/pointer.traits/element_type
-test_src := element_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/pointer.traits/pointer_to
-test_src := pointer_to.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/utilities/memory/pointer.traits/pointer.traits.functions/Android.mk b/test/utilities/memory/pointer.traits/pointer.traits.functions/Android.mk
deleted file mode 100644
index 5fac0a6..0000000
--- a/test/utilities/memory/pointer.traits/pointer.traits.functions/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/pointer.traits/pointer.traits.functions/Android.mk
-
-test_name := utilities/memory/pointer.traits/pointer.traits.functions/pointer_to
-test_src := pointer_to.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/utilities/memory/pointer.traits/pointer.traits.types/Android.mk b/test/utilities/memory/pointer.traits/pointer.traits.types/Android.mk
deleted file mode 100644
index 4ce4967..0000000
--- a/test/utilities/memory/pointer.traits/pointer.traits.types/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/memory/pointer.traits/pointer.traits.types/Android.mk
-
-test_name := utilities/memory/pointer.traits/pointer.traits.types/rebind
-test_src := rebind.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/pointer.traits/pointer.traits.types/difference_type
-test_src := difference_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/pointer.traits/pointer.traits.types/element_type
-test_src := element_type.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/utilities/memory/ptr.align/Android.mk b/test/utilities/memory/ptr.align/Android.mk
deleted file mode 100644
index 1e26234..0000000
--- a/test/utilities/memory/ptr.align/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/ptr.align/Android.mk
-
-test_name := utilities/memory/ptr.align/align
-test_src := align.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/utilities/memory/specialized.algorithms/Android.mk b/test/utilities/memory/specialized.algorithms/Android.mk
deleted file mode 100644
index b25627f..0000000
--- a/test/utilities/memory/specialized.algorithms/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/specialized.algorithms/Android.mk
-
-test_name := utilities/memory/specialized.algorithms/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/utilities/memory/specialized.algorithms/specialized.addressof/Android.mk b/test/utilities/memory/specialized.algorithms/specialized.addressof/Android.mk
deleted file mode 100644
index 66375bb..0000000
--- a/test/utilities/memory/specialized.algorithms/specialized.addressof/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/specialized.algorithms/specialized.addressof/Android.mk
-
-test_name := utilities/memory/specialized.algorithms/specialized.addressof/addressof
-test_src := addressof.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/utilities/memory/specialized.algorithms/uninitialized.copy/Android.mk b/test/utilities/memory/specialized.algorithms/uninitialized.copy/Android.mk
deleted file mode 100644
index 33f3212..0000000
--- a/test/utilities/memory/specialized.algorithms/uninitialized.copy/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/memory/specialized.algorithms/uninitialized.copy/Android.mk
-
-test_name := utilities/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy
-test_src := uninitialized_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy_n
-test_src := uninitialized_copy_n.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/utilities/memory/specialized.algorithms/uninitialized.fill.n/Android.mk b/test/utilities/memory/specialized.algorithms/uninitialized.fill.n/Android.mk
deleted file mode 100644
index 68970a0..0000000
--- a/test/utilities/memory/specialized.algorithms/uninitialized.fill.n/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/specialized.algorithms/uninitialized.fill.n/Android.mk
-
-test_name := utilities/memory/specialized.algorithms/uninitialized.fill.n/uninitialized_fill_n
-test_src := uninitialized_fill_n.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/utilities/memory/specialized.algorithms/uninitialized.fill/Android.mk b/test/utilities/memory/specialized.algorithms/uninitialized.fill/Android.mk
deleted file mode 100644
index bedfe8c..0000000
--- a/test/utilities/memory/specialized.algorithms/uninitialized.fill/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/specialized.algorithms/uninitialized.fill/Android.mk
-
-test_name := utilities/memory/specialized.algorithms/uninitialized.fill/uninitialized_fill
-test_src := uninitialized_fill.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/utilities/memory/storage.iterator/Android.mk b/test/utilities/memory/storage.iterator/Android.mk
deleted file mode 100644
index 97db5c2..0000000
--- a/test/utilities/memory/storage.iterator/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/storage.iterator/Android.mk
-
-test_name := utilities/memory/storage.iterator/raw_storag_iterator
-test_src := raw_storag_iterator.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/utilities/memory/temporary.buffer/Android.mk b/test/utilities/memory/temporary.buffer/Android.mk
deleted file mode 100644
index 10afe54..0000000
--- a/test/utilities/memory/temporary.buffer/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/temporary.buffer/Android.mk
-
-test_name := utilities/memory/temporary.buffer/temporary_buffer
-test_src := temporary_buffer.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/utilities/memory/unique.ptr/Android.mk b/test/utilities/memory/unique.ptr/Android.mk
deleted file mode 100644
index d7d3726..0000000
--- a/test/utilities/memory/unique.ptr/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/Android.mk
-
-test_name := utilities/memory/unique.ptr/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/utilities/memory/unique.ptr/unique.ptr.create/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.create/Android.mk
deleted file mode 100644
index be853a7..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.create/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.create/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.create/make_unique.single
-test_src := make_unique.single.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.create/make_unique.array
-test_src := make_unique.array.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/utilities/memory/unique.ptr/unique.ptr.dltr/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.dltr/Android.mk
deleted file mode 100644
index 93dac77..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.dltr/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.dltr/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.dltr/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/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/Android.mk
deleted file mode 100644
index 64cac62..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor
-test_src := convert_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/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/Android.mk
deleted file mode 100644
index 67cad59..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default
-test_src := 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/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.general/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.general/Android.mk
deleted file mode 100644
index ef3b1a9..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.general/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.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/utilities/memory/unique.ptr/unique.ptr.runtime/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.runtime/Android.mk
deleted file mode 100644
index f1ff926..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.runtime/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.runtime/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/null_asgn
-test_src := null_asgn.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/null_ctor
-test_src := null_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/move01
-test_src := move01.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/nullptr_asgn
-test_src := nullptr_asgn.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/pointer_type
-test_src := pointer_type.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/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/Android.mk
deleted file mode 100644
index 9c998d8..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer01
-test_src := pointer01.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter03
-test_src := pointer_deleter03.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter04
-test_src := pointer_deleter04.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move02
-test_src := move02.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer02
-test_src := pointer02.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move01
-test_src := move01.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter02
-test_src := pointer_deleter02.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default01
-test_src := default01.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default02
-test_src := default02.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/nullptr
-test_src := nullptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter01
-test_src := pointer_deleter01.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/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/Android.mk
deleted file mode 100644
index b9e6181..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/release
-test_src := release.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/reset1
-test_src := reset1.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/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/Android.mk
deleted file mode 100644
index 1f247cc..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/get
-test_src := get.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/explicit_bool
-test_src := explicit_bool.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/index
-test_src := index.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/get_deleter
-test_src := get_deleter.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/utilities/memory/unique.ptr/unique.ptr.single/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.single/Android.mk
deleted file mode 100644
index 69e3246..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.single/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.single/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/pointer_type
-test_src := pointer_type.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/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/Android.mk
deleted file mode 100644
index 088eb5b..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/null
-test_src := null.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move01
-test_src := move01.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01
-test_src := move_convert01.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03
-test_src := move_convert03.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/nullptr
-test_src := nullptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02
-test_src := move_convert02.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/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/Android.mk
deleted file mode 100644
index b47adc7..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/Android.mk
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04
-test_src := move_convert04.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer01
-test_src := pointer01.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07
-test_src := move_convert07.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter03
-test_src := pointer_deleter03.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer03
-test_src := pointer03.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter04
-test_src := pointer_deleter04.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move02
-test_src := move02.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer02
-test_src := pointer02.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05
-test_src := move_convert05.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move01
-test_src := move01.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01
-test_src := move_convert01.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06
-test_src := move_convert06.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter02
-test_src := pointer_deleter02.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default01
-test_src := default01.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter05
-test_src := pointer_deleter05.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default02
-test_src := default02.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer
-test_src := auto_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter06
-test_src := pointer_deleter06.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03
-test_src := move_convert03.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/nullptr
-test_src := nullptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02
-test_src := move_convert02.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter01
-test_src := pointer_deleter01.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/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.dtor/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.dtor/Android.mk
deleted file mode 100644
index f30c9e9..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.dtor/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.dtor/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.dtor/null
-test_src := null.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/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/Android.mk
deleted file mode 100644
index dc4be25..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/release
-test_src := release.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset2
-test_src := reset2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset_self
-test_src := reset_self.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset1
-test_src := reset1.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/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/Android.mk
deleted file mode 100644
index 19b36df..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/dereference
-test_src := dereference.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/get
-test_src := get.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/explicit_bool
-test_src := explicit_bool.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/op_arrow
-test_src := op_arrow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/get_deleter
-test_src := get_deleter.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/utilities/memory/unique.ptr/unique.ptr.special/Android.mk b/test/utilities/memory/unique.ptr/unique.ptr.special/Android.mk
deleted file mode 100644
index d99474e..0000000
--- a/test/utilities/memory/unique.ptr/unique.ptr.special/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/memory/unique.ptr/unique.ptr.special/Android.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.special/cmp_nullptr
-test_src := cmp_nullptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.special/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.special/eq
-test_src := eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/unique.ptr/unique.ptr.special/rel
-test_src := rel.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/utilities/memory/util.dynamic.safety/Android.mk b/test/utilities/memory/util.dynamic.safety/Android.mk
deleted file mode 100644
index 4bd74aa..0000000
--- a/test/utilities/memory/util.dynamic.safety/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/memory/util.dynamic.safety/Android.mk
-
-test_name := utilities/memory/util.dynamic.safety/get_pointer_safety
-test_src := get_pointer_safety.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.dynamic.safety/declare_no_pointers
-test_src := declare_no_pointers.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.dynamic.safety/declare_reachable
-test_src := declare_reachable.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/utilities/memory/util.smartptr/Android.mk b/test/utilities/memory/util.smartptr/Android.mk
deleted file mode 100644
index b7a32f9..0000000
--- a/test/utilities/memory/util.smartptr/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/Android.mk
-
-test_name := utilities/memory/util.smartptr/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/utilities/memory/util.smartptr/util.smartptr.enab/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.enab/Android.mk
deleted file mode 100644
index 9ffbd3d..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.enab/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.enab/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this
-test_src := enable_shared_from_this.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/utilities/memory/util.smartptr/util.smartptr.hash/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.hash/Android.mk
deleted file mode 100644
index 8a3de45..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.hash/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.hash/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr
-test_src := hash_unique_ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr
-test_src := hash_shared_ptr.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/utilities/memory/util.smartptr/util.smartptr.shared.atomic/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/Android.mk
deleted file mode 100644
index 0e60534..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.shared.atomic/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit
-test_src := atomic_compare_exchange_strong_explicit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange
-test_src := atomic_exchange.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit
-test_src := atomic_compare_exchange_weak_explicit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free
-test_src := atomic_is_lock_free.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store
-test_src := atomic_store.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load
-test_src := atomic_load.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit
-test_src := atomic_load_explicit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit
-test_src := atomic_store_explicit.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak
-test_src := atomic_compare_exchange_weak.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong
-test_src := atomic_compare_exchange_strong.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit
-test_src := atomic_exchange_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/utilities/memory/util.smartptr/util.smartptr.shared/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.shared/Android.mk
deleted file mode 100644
index 6fe8194..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.shared/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/Android.mk
deleted file mode 100644
index 21bea63..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter
-test_src := get_deleter.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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/Android.mk
deleted file mode 100644
index 8aa513e..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y
-test_src := auto_ptr_Y.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y
-test_src := unique_ptr_Y.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv
-test_src := shared_ptr_Y_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv
-test_src := shared_ptr_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y
-test_src := shared_ptr_Y.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr
-test_src := shared_ptr.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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/Android.mk
deleted file mode 100644
index ad71ff0..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast
-test_src := static_pointer_cast.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast
-test_src := const_pointer_cast.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast
-test_src := dynamic_pointer_cast.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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/Android.mk
deleted file mode 100644
index 5bfa294..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr
-test_src := cmp_nullptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/lt
-test_src := lt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/eq
-test_src := 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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/Android.mk
deleted file mode 100644
index 45abb71..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/Android.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr
-test_src := unique_ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw
-test_src := nullptr_t_deleter_throw.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/weak_ptr
-test_src := weak_ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw
-test_src := pointer_throw.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y_rv
-test_src := shared_ptr_Y_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw
-test_src := pointer_deleter_throw.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer
-test_src := shared_ptr_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr
-test_src := auto_ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_rv
-test_src := shared_ptr_rv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y
-test_src := shared_ptr_Y.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator
-test_src := nullptr_t_deleter_allocator.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter
-test_src := nullptr_t_deleter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter
-test_src := pointer_deleter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr
-test_src := shared_ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw
-test_src := pointer_deleter_allocator_throw.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw
-test_src := nullptr_t_deleter_allocator_throw.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t
-test_src := nullptr_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator
-test_src := pointer_deleter_allocator.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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/Android.mk
deleted file mode 100644
index f93aa57..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared
-test_src := make_shared.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared
-test_src := allocate_shared.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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.dest/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.dest/Android.mk
deleted file mode 100644
index 729ddcf..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.dest/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.dest/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.dest/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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/Android.mk
deleted file mode 100644
index 7b5b35c..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io
-test_src := io.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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/Android.mk
deleted file mode 100644
index e31b725..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter
-test_src := reset_pointer_deleter.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer
-test_src := reset_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset
-test_src := reset.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator
-test_src := reset_pointer_deleter_allocator.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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/Android.mk
deleted file mode 100644
index d1b9a22..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_shared_ptr
-test_src := owner_before_shared_ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference
-test_src := dereference.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow
-test_src := arrow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool
-test_src := op_bool.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_weak_ptr
-test_src := owner_before_weak_ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique
-test_src := unique.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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/Android.mk
deleted file mode 100644
index 683cf71..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/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/utilities/memory/util.smartptr/util.smartptr.weak/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.weak/Android.mk
deleted file mode 100644
index bc202fb..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.weak/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.weak/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/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/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/Android.mk
deleted file mode 100644
index ae33fc6..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/owner_less
-test_src := owner_less.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/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/Android.mk
deleted file mode 100644
index e32b3eb..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr
-test_src := weak_ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y
-test_src := shared_ptr_Y.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y
-test_src := weak_ptr_Y.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/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/Android.mk
deleted file mode 100644
index f93cb13..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr
-test_src := weak_ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y
-test_src := shared_ptr_Y.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y
-test_src := weak_ptr_Y.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/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.dest/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.dest/Android.mk
deleted file mode 100644
index a1e0cd1..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.dest/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.dest/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.dest/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/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/Android.mk
deleted file mode 100644
index c325986..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset
-test_src := reset.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/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/Android.mk
deleted file mode 100644
index 8960459..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock
-test_src := lock.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_shared_ptr
-test_src := owner_before_shared_ptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired
-test_src := expired.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_weak_ptr
-test_src := owner_before_weak_ptr.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/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/Android.mk
deleted file mode 100644
index 5c80af1..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/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/utilities/memory/util.smartptr/util.smartptr.weakptr/Android.mk b/test/utilities/memory/util.smartptr/util.smartptr.weakptr/Android.mk
deleted file mode 100644
index 00bb73f..0000000
--- a/test/utilities/memory/util.smartptr/util.smartptr.weakptr/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/memory/util.smartptr/util.smartptr.weakptr/Android.mk
-
-test_name := utilities/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr
-test_src := bad_weak_ptr.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/utilities/meta/Android.mk b/test/utilities/meta/Android.mk
deleted file mode 100644
index df100c3..0000000
--- a/test/utilities/meta/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/meta/Android.mk
-
-test_name := utilities/meta/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/utilities/meta/meta.hel/Android.mk b/test/utilities/meta/meta.hel/Android.mk
deleted file mode 100644
index 0715769..0000000
--- a/test/utilities/meta/meta.hel/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/meta/meta.hel/Android.mk
-
-test_name := utilities/meta/meta.hel/integral_constant
-test_src := integral_constant.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/utilities/meta/meta.rel/Android.mk b/test/utilities/meta/meta.rel/Android.mk
deleted file mode 100644
index 771e9d6..0000000
--- a/test/utilities/meta/meta.rel/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/meta/meta.rel/Android.mk
-
-test_name := utilities/meta/meta.rel/is_same
-test_src := is_same.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.rel/is_convertible
-test_src := is_convertible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.rel/is_base_of
-test_src := is_base_of.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/utilities/meta/meta.rqmts/Android.mk b/test/utilities/meta/meta.rqmts/Android.mk
deleted file mode 100644
index e7030fc..0000000
--- a/test/utilities/meta/meta.rqmts/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/meta/meta.rqmts/Android.mk
-
-test_name := utilities/meta/meta.rqmts/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/utilities/meta/meta.trans/Android.mk b/test/utilities/meta/meta.trans/Android.mk
deleted file mode 100644
index e4db1b7..0000000
--- a/test/utilities/meta/meta.trans/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/meta/meta.trans/Android.mk
-
-test_name := utilities/meta/meta.trans/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/utilities/meta/meta.trans/meta.trans.arr/Android.mk b/test/utilities/meta/meta.trans/meta.trans.arr/Android.mk
deleted file mode 100644
index 9e70a49..0000000
--- a/test/utilities/meta/meta.trans/meta.trans.arr/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/meta/meta.trans/meta.trans.arr/Android.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.arr/remove_all_extents
-test_src := remove_all_extents.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.arr/remove_extent
-test_src := remove_extent.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/utilities/meta/meta.trans/meta.trans.cv/Android.mk b/test/utilities/meta/meta.trans/meta.trans.cv/Android.mk
deleted file mode 100644
index 76d526a..0000000
--- a/test/utilities/meta/meta.trans/meta.trans.cv/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/utilities/meta/meta.trans/meta.trans.cv/Android.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.cv/remove_const
-test_src := remove_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.cv/remove_volatile
-test_src := remove_volatile.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.cv/add_cv
-test_src := add_cv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.cv/remove_cv
-test_src := remove_cv.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.cv/add_const
-test_src := add_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.cv/add_volatile
-test_src := add_volatile.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/utilities/meta/meta.trans/meta.trans.other/Android.mk b/test/utilities/meta/meta.trans/meta.trans.other/Android.mk
deleted file mode 100644
index 754ba07..0000000
--- a/test/utilities/meta/meta.trans/meta.trans.other/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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/utilities/meta/meta.trans/meta.trans.other/Android.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.other/aligned_union
-test_src := aligned_union.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.other/decay
-test_src := decay.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.other/result_of
-test_src := result_of.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.other/underlying_type
-test_src := underlying_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.other/enable_if
-test_src := enable_if.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.other/conditional
-test_src := conditional.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.other/common_type
-test_src := common_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/test/utilities/meta/meta.trans/meta.trans.ptr/Android.mk b/test/utilities/meta/meta.trans/meta.trans.ptr/Android.mk
deleted file mode 100644
index 5c8f087..0000000
--- a/test/utilities/meta/meta.trans/meta.trans.ptr/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/meta/meta.trans/meta.trans.ptr/Android.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.ptr/add_pointer
-test_src := add_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.ptr/remove_pointer
-test_src := remove_pointer.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/utilities/meta/meta.trans/meta.trans.ref/Android.mk b/test/utilities/meta/meta.trans/meta.trans.ref/Android.mk
deleted file mode 100644
index f57c6d9..0000000
--- a/test/utilities/meta/meta.trans/meta.trans.ref/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/meta/meta.trans/meta.trans.ref/Android.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.ref/add_rvalue_ref
-test_src := add_rvalue_ref.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.ref/remove_ref
-test_src := remove_ref.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.ref/add_lvalue_ref
-test_src := add_lvalue_ref.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/utilities/meta/meta.trans/meta.trans.sign/Android.mk b/test/utilities/meta/meta.trans/meta.trans.sign/Android.mk
deleted file mode 100644
index 70638f3..0000000
--- a/test/utilities/meta/meta.trans/meta.trans.sign/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/meta/meta.trans/meta.trans.sign/Android.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.sign/make_signed
-test_src := make_signed.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.trans/meta.trans.sign/make_unsigned
-test_src := make_unsigned.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/utilities/meta/meta.type.synop/Android.mk b/test/utilities/meta/meta.type.synop/Android.mk
deleted file mode 100644
index c7763a6..0000000
--- a/test/utilities/meta/meta.type.synop/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/meta/meta.type.synop/Android.mk
-
-test_name := utilities/meta/meta.type.synop/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/utilities/meta/meta.unary.prop.query/Android.mk b/test/utilities/meta/meta.unary.prop.query/Android.mk
deleted file mode 100644
index 6cebea9..0000000
--- a/test/utilities/meta/meta.unary.prop.query/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/meta/meta.unary.prop.query/Android.mk
-
-test_name := utilities/meta/meta.unary.prop.query/alignment_of
-test_src := alignment_of.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary.prop.query/rank
-test_src := rank.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary.prop.query/extent
-test_src := extent.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/utilities/meta/meta.unary/Android.mk b/test/utilities/meta/meta.unary/Android.mk
deleted file mode 100644
index 165e592..0000000
--- a/test/utilities/meta/meta.unary/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/meta/meta.unary/Android.mk
-
-test_name := utilities/meta/meta.unary/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/utilities/meta/meta.unary/meta.unary.cat/Android.mk b/test/utilities/meta/meta.unary/meta.unary.cat/Android.mk
deleted file mode 100644
index 6be4e66..0000000
--- a/test/utilities/meta/meta.unary/meta.unary.cat/Android.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# 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/utilities/meta/meta.unary/meta.unary.cat/Android.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.cat/union
-test_src := union.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.cat/member_object_pointer
-test_src := member_object_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.cat/lvalue_ref
-test_src := lvalue_ref.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.cat/function
-test_src := function.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.cat/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.cat/array
-test_src := array.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.cat/enum
-test_src := enum.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.cat/floating_point
-test_src := floating_point.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.cat/void
-test_src := void.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.cat/member_function_pointer
-test_src := member_function_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.cat/rvalue_ref
-test_src := rvalue_ref.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.cat/nullptr
-test_src := nullptr.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.cat/integral
-test_src := integral.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.cat/class
-test_src := class.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/utilities/meta/meta.unary/meta.unary.comp/Android.mk b/test/utilities/meta/meta.unary/meta.unary.comp/Android.mk
deleted file mode 100644
index bb7232d..0000000
--- a/test/utilities/meta/meta.unary/meta.unary.comp/Android.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# 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/utilities/meta/meta.unary/meta.unary.comp/Android.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.comp/union
-test_src := union.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.comp/member_object_pointer
-test_src := member_object_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.comp/lvalue_ref
-test_src := lvalue_ref.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.comp/function
-test_src := function.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.comp/pointer
-test_src := pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.comp/array
-test_src := array.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.comp/enum
-test_src := enum.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.comp/floating_point
-test_src := floating_point.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.comp/void
-test_src := void.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.comp/member_function_pointer
-test_src := member_function_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.comp/rvalue_ref
-test_src := rvalue_ref.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.comp/integral
-test_src := integral.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.comp/class
-test_src := class.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/utilities/meta/meta.unary/meta.unary.prop/Android.mk b/test/utilities/meta/meta.unary/meta.unary.prop/Android.mk
deleted file mode 100644
index fe9971b..0000000
--- a/test/utilities/meta/meta.unary/meta.unary.prop/Android.mk
+++ /dev/null
@@ -1,175 +0,0 @@
-#
-# 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/utilities/meta/meta.unary/meta.unary.prop/Android.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_move_constructible
-test_src := is_move_constructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_default_constructible
-test_src := is_default_constructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_assignable
-test_src := is_trivially_move_assignable.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_assignable
-test_src := is_nothrow_copy_assignable.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_constructible
-test_src := is_trivially_move_constructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_nothrow_default_constructible
-test_src := is_nothrow_default_constructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_trivially_constructible
-test_src := is_trivially_constructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/__has_operator_addressof
-test_src := __has_operator_addressof.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_assignable
-test_src := is_nothrow_move_assignable.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_final
-test_src := is_final.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable
-test_src := is_copy_assignable.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_nothrow_constructible
-test_src := is_nothrow_constructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_pod
-test_src := is_pod.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_constructible
-test_src := is_nothrow_copy_constructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_empty
-test_src := is_empty.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_signed
-test_src := is_signed.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_trivially_destructible
-test_src := is_trivially_destructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_polymorphic
-test_src := is_polymorphic.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/has_virtual_destructor
-test_src := has_virtual_destructor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_constructible
-test_src := is_constructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_assignable
-test_src := is_trivially_copy_assignable.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_nothrow_assignable
-test_src := is_nothrow_assignable.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_move_assignable
-test_src := is_move_assignable.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_trivial
-test_src := is_trivial.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_standard_layout
-test_src := is_standard_layout.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_trivialially_copyable
-test_src := is_trivialially_copyable.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_nothrow_destructible
-test_src := is_nothrow_destructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_unsigned
-test_src := is_unsigned.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_volatile
-test_src := is_volatile.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_literal_type
-test_src := is_literal_type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_constructible
-test_src := is_trivially_copy_constructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible
-test_src := is_copy_constructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_destructible
-test_src := is_destructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_abstract
-test_src := is_abstract.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_assignable
-test_src := is_assignable.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_constructible
-test_src := is_nothrow_move_constructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_const
-test_src := is_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_trivially_default_constructible
-test_src := is_trivially_default_constructible.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/meta/meta.unary/meta.unary.prop/is_trivially_assignable
-test_src := is_trivially_assignable.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/utilities/optional/Android.mk b/test/utilities/optional/Android.mk
deleted file mode 100644
index c6d7561..0000000
--- a/test/utilities/optional/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/optional/Android.mk
-
-test_name := utilities/optional/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/utilities/optional/optional.bad_optional_access/Android.mk b/test/utilities/optional/optional.bad_optional_access/Android.mk
deleted file mode 100644
index 8bb2eb9..0000000
--- a/test/utilities/optional/optional.bad_optional_access/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/utilities/optional/optional.bad_optional_access/Android.mk
-
-test_name := utilities/optional/optional.bad_optional_access/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.bad_optional_access/string
-test_src := string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.bad_optional_access/copy_ctor
-test_src := copy_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.bad_optional_access/derive
-test_src := derive.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.bad_optional_access/char_pointer
-test_src := char_pointer.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.bad_optional_access/copy_assign
-test_src := copy_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/utilities/optional/optional.comp_with_t/Android.mk b/test/utilities/optional/optional.comp_with_t/Android.mk
deleted file mode 100644
index 6b52042..0000000
--- a/test/utilities/optional/optional.comp_with_t/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/optional/optional.comp_with_t/Android.mk
-
-test_name := utilities/optional/optional.comp_with_t/less_than
-test_src := less_than.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.comp_with_t/equal
-test_src := equal.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/utilities/optional/optional.defs/Android.mk b/test/utilities/optional/optional.defs/Android.mk
deleted file mode 100644
index 3bcf8cf..0000000
--- a/test/utilities/optional/optional.defs/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/optional/optional.defs/Android.mk
-
-test_name := utilities/optional/optional.defs/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/utilities/optional/optional.general/Android.mk b/test/utilities/optional/optional.general/Android.mk
deleted file mode 100644
index 40869c9..0000000
--- a/test/utilities/optional/optional.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/optional/optional.general/Android.mk
-
-test_name := utilities/optional/optional.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/utilities/optional/optional.hash/Android.mk b/test/utilities/optional/optional.hash/Android.mk
deleted file mode 100644
index a151135..0000000
--- a/test/utilities/optional/optional.hash/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/optional/optional.hash/Android.mk
-
-test_name := utilities/optional/optional.hash/hash
-test_src := hash.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/utilities/optional/optional.inplace/Android.mk b/test/utilities/optional/optional.inplace/Android.mk
deleted file mode 100644
index 8ecc756..0000000
--- a/test/utilities/optional/optional.inplace/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/optional/optional.inplace/Android.mk
-
-test_name := utilities/optional/optional.inplace/in_place_t
-test_src := in_place_t.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/utilities/optional/optional.nullops/Android.mk b/test/utilities/optional/optional.nullops/Android.mk
deleted file mode 100644
index 7813d57..0000000
--- a/test/utilities/optional/optional.nullops/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/optional/optional.nullops/Android.mk
-
-test_name := utilities/optional/optional.nullops/less_than
-test_src := less_than.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.nullops/eqaul
-test_src := eqaul.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/utilities/optional/optional.nullopt/Android.mk b/test/utilities/optional/optional.nullopt/Android.mk
deleted file mode 100644
index f40a203..0000000
--- a/test/utilities/optional/optional.nullopt/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/optional/optional.nullopt/Android.mk
-
-test_name := utilities/optional/optional.nullopt/nullopt_t
-test_src := nullopt_t.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/utilities/optional/optional.object/Android.mk b/test/utilities/optional/optional.object/Android.mk
deleted file mode 100644
index 9b12c04..0000000
--- a/test/utilities/optional/optional.object/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/optional/optional.object/Android.mk
-
-test_name := utilities/optional/optional.object/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/utilities/optional/optional.object/optional.object.assign/Android.mk b/test/utilities/optional/optional.object/optional.object.assign/Android.mk
deleted file mode 100644
index 0b50dcd..0000000
--- a/test/utilities/optional/optional.object/optional.object.assign/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/utilities/optional/optional.object/optional.object.assign/Android.mk
-
-test_name := utilities/optional/optional.object/optional.object.assign/assign_value
-test_src := assign_value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.assign/emplace_initializer_list
-test_src := emplace_initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.assign/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.assign/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.assign/emplace
-test_src := emplace.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.assign/nullopt_t
-test_src := nullopt_t.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/utilities/optional/optional.object/optional.object.ctor/Android.mk b/test/utilities/optional/optional.object/optional.object.ctor/Android.mk
deleted file mode 100644
index 372385b..0000000
--- a/test/utilities/optional/optional.object/optional.object.ctor/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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/utilities/optional/optional.object/optional.object.ctor/Android.mk
-
-test_name := utilities/optional/optional.object/optional.object.ctor/rvalue_T
-test_src := rvalue_T.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.ctor/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.ctor/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.ctor/const_T
-test_src := const_T.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.ctor/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.ctor/initializer_list
-test_src := initializer_list.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.ctor/nullopt_t
-test_src := nullopt_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.ctor/in_place_t
-test_src := in_place_t.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/utilities/optional/optional.object/optional.object.dtor/Android.mk b/test/utilities/optional/optional.object/optional.object.dtor/Android.mk
deleted file mode 100644
index 44a4ea7..0000000
--- a/test/utilities/optional/optional.object/optional.object.dtor/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/optional/optional.object/optional.object.dtor/Android.mk
-
-test_name := utilities/optional/optional.object/optional.object.dtor/dtor
-test_src := dtor.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/utilities/optional/optional.object/optional.object.observe/Android.mk b/test/utilities/optional/optional.object/optional.object.observe/Android.mk
deleted file mode 100644
index 6478d27..0000000
--- a/test/utilities/optional/optional.object/optional.object.observe/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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/utilities/optional/optional.object/optional.object.observe/Android.mk
-
-test_name := utilities/optional/optional.object/optional.object.observe/bool
-test_src := bool.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.observe/value_const
-test_src := value_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.observe/value_or
-test_src := value_or.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.observe/dereference_const
-test_src := dereference_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.observe/dereference
-test_src := dereference.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.observe/op_arrow_const
-test_src := op_arrow_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.observe/value
-test_src := value.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.observe/value_or_const
-test_src := value_or_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.object/optional.object.observe/op_arrow
-test_src := op_arrow.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/utilities/optional/optional.object/optional.object.swap/Android.mk b/test/utilities/optional/optional.object/optional.object.swap/Android.mk
deleted file mode 100644
index e96f8d2..0000000
--- a/test/utilities/optional/optional.object/optional.object.swap/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/optional/optional.object/optional.object.swap/Android.mk
-
-test_name := utilities/optional/optional.object/optional.object.swap/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/utilities/optional/optional.relops/Android.mk b/test/utilities/optional/optional.relops/Android.mk
deleted file mode 100644
index 06d39c5..0000000
--- a/test/utilities/optional/optional.relops/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/optional/optional.relops/Android.mk
-
-test_name := utilities/optional/optional.relops/less_than
-test_src := less_than.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.relops/equal
-test_src := equal.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/utilities/optional/optional.specalg/Android.mk b/test/utilities/optional/optional.specalg/Android.mk
deleted file mode 100644
index fa7d78b..0000000
--- a/test/utilities/optional/optional.specalg/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/optional/optional.specalg/Android.mk
-
-test_name := utilities/optional/optional.specalg/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/optional/optional.specalg/make_optional
-test_src := make_optional.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/utilities/optional/optional.syn/Android.mk b/test/utilities/optional/optional.syn/Android.mk
deleted file mode 100644
index d702791..0000000
--- a/test/utilities/optional/optional.syn/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/optional/optional.syn/Android.mk
-
-test_name := utilities/optional/optional.syn/optional_includes_initializer_list
-test_src := optional_includes_initializer_list.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/utilities/ratio/Android.mk b/test/utilities/ratio/Android.mk
deleted file mode 100644
index 40b90db..0000000
--- a/test/utilities/ratio/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/ratio/Android.mk
-
-test_name := utilities/ratio/typedefs
-test_src := typedefs.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/ratio/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/utilities/ratio/ratio.arithmetic/Android.mk b/test/utilities/ratio/ratio.arithmetic/Android.mk
deleted file mode 100644
index 941bb78..0000000
--- a/test/utilities/ratio/ratio.arithmetic/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/ratio/ratio.arithmetic/Android.mk
-
-test_name := utilities/ratio/ratio.arithmetic/ratio_multiply
-test_src := ratio_multiply.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/ratio/ratio.arithmetic/ratio_subtract
-test_src := ratio_subtract.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/ratio/ratio.arithmetic/ratio_add
-test_src := ratio_add.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/ratio/ratio.arithmetic/ratio_divide
-test_src := ratio_divide.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/utilities/ratio/ratio.comparison/Android.mk b/test/utilities/ratio/ratio.comparison/Android.mk
deleted file mode 100644
index 85214b0..0000000
--- a/test/utilities/ratio/ratio.comparison/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/utilities/ratio/ratio.comparison/Android.mk
-
-test_name := utilities/ratio/ratio.comparison/ratio_not_equal
-test_src := ratio_not_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/ratio/ratio.comparison/ratio_greater_equal
-test_src := ratio_greater_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/ratio/ratio.comparison/ratio_equal
-test_src := ratio_equal.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/ratio/ratio.comparison/ratio_less
-test_src := ratio_less.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/ratio/ratio.comparison/ratio_greater
-test_src := ratio_greater.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/ratio/ratio.comparison/ratio_less_equal
-test_src := ratio_less_equal.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/utilities/ratio/ratio.ratio/Android.mk b/test/utilities/ratio/ratio.ratio/Android.mk
deleted file mode 100644
index c018da2..0000000
--- a/test/utilities/ratio/ratio.ratio/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/ratio/ratio.ratio/Android.mk
-
-test_name := utilities/ratio/ratio.ratio/ratio
-test_src := ratio.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/utilities/ratio/ratio.si/Android.mk b/test/utilities/ratio/ratio.si/Android.mk
deleted file mode 100644
index 2d11ee2..0000000
--- a/test/utilities/ratio/ratio.si/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/ratio/ratio.si/Android.mk
-
-test_name := utilities/ratio/ratio.si/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/utilities/template.bitset/Android.mk b/test/utilities/template.bitset/Android.mk
deleted file mode 100644
index c522b49..0000000
--- a/test/utilities/template.bitset/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/template.bitset/Android.mk
-
-test_name := utilities/template.bitset/includes
-test_src := includes.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/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/utilities/template.bitset/bitset.cons/Android.mk b/test/utilities/template.bitset/bitset.cons/Android.mk
deleted file mode 100644
index b1c6299..0000000
--- a/test/utilities/template.bitset/bitset.cons/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/template.bitset/bitset.cons/Android.mk
-
-test_name := utilities/template.bitset/bitset.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.cons/ull_ctor
-test_src := ull_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.cons/char_ptr_ctor
-test_src := char_ptr_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.cons/string_ctor
-test_src := string_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/utilities/template.bitset/bitset.hash/Android.mk b/test/utilities/template.bitset/bitset.hash/Android.mk
deleted file mode 100644
index 9dd36c2..0000000
--- a/test/utilities/template.bitset/bitset.hash/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/template.bitset/bitset.hash/Android.mk
-
-test_name := utilities/template.bitset/bitset.hash/bitset
-test_src := bitset.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/utilities/template.bitset/bitset.members/Android.mk b/test/utilities/template.bitset/bitset.members/Android.mk
deleted file mode 100644
index b8d30a2..0000000
--- a/test/utilities/template.bitset/bitset.members/Android.mk
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# 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/utilities/template.bitset/bitset.members/Android.mk
-
-test_name := utilities/template.bitset/bitset.members/right_shift
-test_src := right_shift.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/flip_all
-test_src := flip_all.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/op_and_eq
-test_src := op_and_eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/op_or_eq
-test_src := op_or_eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/to_ullong
-test_src := to_ullong.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/index_const
-test_src := index_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/set_one
-test_src := set_one.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/right_shift_eq
-test_src := right_shift_eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/to_ulong
-test_src := to_ulong.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/left_shift
-test_src := left_shift.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/any
-test_src := any.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/op_eq_eq
-test_src := op_eq_eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/test
-test_src := test.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/size
-test_src := size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/reset_all
-test_src := reset_all.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/set_all
-test_src := set_all.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/flip_one
-test_src := flip_one.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/all
-test_src := all.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/none
-test_src := none.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/to_string
-test_src := to_string.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/reset_one
-test_src := reset_one.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/index
-test_src := index.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/left_shift_eq
-test_src := left_shift_eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/count
-test_src := count.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/op_xor_eq
-test_src := op_xor_eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.members/not_all
-test_src := not_all.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/utilities/template.bitset/bitset.operators/Android.mk b/test/utilities/template.bitset/bitset.operators/Android.mk
deleted file mode 100644
index ed21d3a..0000000
--- a/test/utilities/template.bitset/bitset.operators/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/utilities/template.bitset/bitset.operators/Android.mk
-
-test_name := utilities/template.bitset/bitset.operators/op_or
-test_src := op_or.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.operators/op_and
-test_src := op_and.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.operators/stream_out
-test_src := stream_out.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.operators/stream_in
-test_src := stream_in.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/template.bitset/bitset.operators/op_not
-test_src := op_not.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/utilities/time/Android.mk b/test/utilities/time/Android.mk
deleted file mode 100644
index 61cffce..0000000
--- a/test/utilities/time/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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/utilities/time/Android.mk
-
-test_name := utilities/time/milliseconds
-test_src := milliseconds.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/hours
-test_src := hours.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/minutes
-test_src := minutes.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/version
-test_src := version.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/nanoseconds
-test_src := nanoseconds.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/seconds
-test_src := seconds.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/microseconds
-test_src := microseconds.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/utilities/time/time.clock.req/Android.mk b/test/utilities/time/time.clock.req/Android.mk
deleted file mode 100644
index f2924f8..0000000
--- a/test/utilities/time/time.clock.req/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/time/time.clock.req/Android.mk
-
-test_name := utilities/time/time.clock.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/utilities/time/time.clock/Android.mk b/test/utilities/time/time.clock/Android.mk
deleted file mode 100644
index 2a8df8b..0000000
--- a/test/utilities/time/time.clock/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/time/time.clock/Android.mk
-
-test_name := utilities/time/time.clock/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/utilities/time/time.clock/time.clock.hires/Android.mk b/test/utilities/time/time.clock/time.clock.hires/Android.mk
deleted file mode 100644
index eb1a211..0000000
--- a/test/utilities/time/time.clock/time.clock.hires/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/time/time.clock/time.clock.hires/Android.mk
-
-test_name := utilities/time/time.clock/time.clock.hires/now
-test_src := now.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.clock/time.clock.hires/consistency
-test_src := consistency.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/utilities/time/time.clock/time.clock.steady/Android.mk b/test/utilities/time/time.clock/time.clock.steady/Android.mk
deleted file mode 100644
index 23c5310..0000000
--- a/test/utilities/time/time.clock/time.clock.steady/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/time/time.clock/time.clock.steady/Android.mk
-
-test_name := utilities/time/time.clock/time.clock.steady/now
-test_src := now.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.clock/time.clock.steady/consistency
-test_src := consistency.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/utilities/time/time.clock/time.clock.system/Android.mk b/test/utilities/time/time.clock/time.clock.system/Android.mk
deleted file mode 100644
index ff5ffa8..0000000
--- a/test/utilities/time/time.clock/time.clock.system/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/utilities/time/time.clock/time.clock.system/Android.mk
-
-test_name := utilities/time/time.clock/time.clock.system/now
-test_src := now.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.clock/time.clock.system/consistency
-test_src := consistency.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.clock/time.clock.system/rep_signed
-test_src := rep_signed.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.clock/time.clock.system/to_time_t
-test_src := to_time_t.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.clock/time.clock.system/from_time_t
-test_src := from_time_t.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/utilities/time/time.duration/Android.mk b/test/utilities/time/time.duration/Android.mk
deleted file mode 100644
index e8ac3cf..0000000
--- a/test/utilities/time/time.duration/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/time/time.duration/Android.mk
-
-test_name := utilities/time/time.duration/default_ratio
-test_src := default_ratio.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/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/utilities/time/time.duration/time.duration.arithmetic/Android.mk b/test/utilities/time/time.duration/time.duration.arithmetic/Android.mk
deleted file mode 100644
index 0e639cc..0000000
--- a/test/utilities/time/time.duration/time.duration.arithmetic/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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/utilities/time/time.duration/time.duration.arithmetic/Android.mk
-
-test_name := utilities/time/time.duration/time.duration.arithmetic/op_times=
-test_src := op_times=.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.arithmetic/op_+
-test_src := op_+.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.arithmetic/op_-
-test_src := op_-.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.arithmetic/op_--
-test_src := op_--.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.arithmetic/op_++
-test_src := op_++.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.arithmetic/op_++int
-test_src := op_++int.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.arithmetic/op_+=
-test_src := op_+=.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.arithmetic/op_-=
-test_src := op_-=.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.arithmetic/op_mod=rep
-test_src := op_mod=rep.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.arithmetic/op_mod=duration
-test_src := op_mod=duration.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.arithmetic/op_--int
-test_src := op_--int.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.arithmetic/op_divide=
-test_src := op_divide=.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/utilities/time/time.duration/time.duration.cast/Android.mk b/test/utilities/time/time.duration/time.duration.cast/Android.mk
deleted file mode 100644
index de98dc3..0000000
--- a/test/utilities/time/time.duration/time.duration.cast/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/time/time.duration/time.duration.cast/Android.mk
-
-test_name := utilities/time/time.duration/time.duration.cast/duration_cast
-test_src := duration_cast.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/utilities/time/time.duration/time.duration.comparisons/Android.mk b/test/utilities/time/time.duration/time.duration.comparisons/Android.mk
deleted file mode 100644
index 1fcc0d9..0000000
--- a/test/utilities/time/time.duration/time.duration.comparisons/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/time/time.duration/time.duration.comparisons/Android.mk
-
-test_name := utilities/time/time.duration/time.duration.comparisons/op_less
-test_src := op_less.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.comparisons/op_equal
-test_src := op_equal.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/utilities/time/time.duration/time.duration.cons/Android.mk b/test/utilities/time/time.duration/time.duration.cons/Android.mk
deleted file mode 100644
index 28ec22a..0000000
--- a/test/utilities/time/time.duration/time.duration.cons/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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/utilities/time/time.duration/time.duration.cons/Android.mk
-
-test_name := utilities/time/time.duration/time.duration.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.cons/convert_inexact
-test_src := convert_inexact.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.cons/rep02
-test_src := rep02.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.cons/convert_exact
-test_src := convert_exact.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.cons/convert_overflow
-test_src := convert_overflow.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.cons/convert_int_to_float
-test_src := convert_int_to_float.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.cons/rep
-test_src := rep.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/utilities/time/time.duration/time.duration.literals/Android.mk b/test/utilities/time/time.duration/time.duration.literals/Android.mk
deleted file mode 100644
index db6a5db..0000000
--- a/test/utilities/time/time.duration/time.duration.literals/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/time/time.duration/time.duration.literals/Android.mk
-
-test_name := utilities/time/time.duration/time.duration.literals/literals2
-test_src := literals2.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.literals/literals1
-test_src := literals1.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.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/utilities/time/time.duration/time.duration.nonmember/Android.mk b/test/utilities/time/time.duration/time.duration.nonmember/Android.mk
deleted file mode 100644
index 841db38..0000000
--- a/test/utilities/time/time.duration/time.duration.nonmember/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# 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/utilities/time/time.duration/time.duration.nonmember/Android.mk
-
-test_name := utilities/time/time.duration/time.duration.nonmember/op_times_rep
-test_src := op_times_rep.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.nonmember/op_mod_rep
-test_src := op_mod_rep.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.nonmember/op_+
-test_src := op_+.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.nonmember/op_-
-test_src := op_-.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.nonmember/op_divide_rep
-test_src := op_divide_rep.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.nonmember/op_mod_duration
-test_src := op_mod_duration.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.nonmember/op_divide_duration
-test_src := op_divide_duration.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/utilities/time/time.duration/time.duration.observer/Android.mk b/test/utilities/time/time.duration/time.duration.observer/Android.mk
deleted file mode 100644
index f3dedbd..0000000
--- a/test/utilities/time/time.duration/time.duration.observer/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/time/time.duration/time.duration.observer/Android.mk
-
-test_name := utilities/time/time.duration/time.duration.observer/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/utilities/time/time.duration/time.duration.special/Android.mk b/test/utilities/time/time.duration/time.duration.special/Android.mk
deleted file mode 100644
index 2dfaa22..0000000
--- a/test/utilities/time/time.duration/time.duration.special/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/time/time.duration/time.duration.special/Android.mk
-
-test_name := utilities/time/time.duration/time.duration.special/zero
-test_src := zero.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.special/min
-test_src := min.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.duration/time.duration.special/max
-test_src := max.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/utilities/time/time.point/Android.mk b/test/utilities/time/time.point/Android.mk
deleted file mode 100644
index 3a1fac7..0000000
--- a/test/utilities/time/time.point/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/time/time.point/Android.mk
-
-test_name := utilities/time/time.point/default_duration
-test_src := default_duration.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/utilities/time/time.point/time.point.arithmetic/Android.mk b/test/utilities/time/time.point/time.point.arithmetic/Android.mk
deleted file mode 100644
index de5feb9..0000000
--- a/test/utilities/time/time.point/time.point.arithmetic/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/time/time.point/time.point.arithmetic/Android.mk
-
-test_name := utilities/time/time.point/time.point.arithmetic/op_+=
-test_src := op_+=.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.point/time.point.arithmetic/op_-=
-test_src := 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/utilities/time/time.point/time.point.cast/Android.mk b/test/utilities/time/time.point/time.point.cast/Android.mk
deleted file mode 100644
index 23e75c5..0000000
--- a/test/utilities/time/time.point/time.point.cast/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/time/time.point/time.point.cast/Android.mk
-
-test_name := utilities/time/time.point/time.point.cast/time_point_cast
-test_src := time_point_cast.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/utilities/time/time.point/time.point.comparisons/Android.mk b/test/utilities/time/time.point/time.point.comparisons/Android.mk
deleted file mode 100644
index e93d40f..0000000
--- a/test/utilities/time/time.point/time.point.comparisons/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/time/time.point/time.point.comparisons/Android.mk
-
-test_name := utilities/time/time.point/time.point.comparisons/op_less
-test_src := op_less.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.point/time.point.comparisons/op_equal
-test_src := op_equal.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/utilities/time/time.point/time.point.cons/Android.mk b/test/utilities/time/time.point/time.point.cons/Android.mk
deleted file mode 100644
index 8752a5b..0000000
--- a/test/utilities/time/time.point/time.point.cons/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/time/time.point/time.point.cons/Android.mk
-
-test_name := utilities/time/time.point/time.point.cons/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.point/time.point.cons/convert
-test_src := convert.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.point/time.point.cons/duration
-test_src := duration.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/utilities/time/time.point/time.point.nonmember/Android.mk b/test/utilities/time/time.point/time.point.nonmember/Android.mk
deleted file mode 100644
index 3df3a1b..0000000
--- a/test/utilities/time/time.point/time.point.nonmember/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/time/time.point/time.point.nonmember/Android.mk
-
-test_name := utilities/time/time.point/time.point.nonmember/op_+
-test_src := op_+.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.point/time.point.nonmember/op_-duration
-test_src := op_-duration.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.point/time.point.nonmember/op_-time_point
-test_src := op_-time_point.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/utilities/time/time.point/time.point.observer/Android.mk b/test/utilities/time/time.point/time.point.observer/Android.mk
deleted file mode 100644
index 219aff8..0000000
--- a/test/utilities/time/time.point/time.point.observer/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/time/time.point/time.point.observer/Android.mk
-
-test_name := utilities/time/time.point/time.point.observer/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/utilities/time/time.point/time.point.special/Android.mk b/test/utilities/time/time.point/time.point.special/Android.mk
deleted file mode 100644
index 0ec96f2..0000000
--- a/test/utilities/time/time.point/time.point.special/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/time/time.point/time.point.special/Android.mk
-
-test_name := utilities/time/time.point/time.point.special/min
-test_src := min.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.point/time.point.special/max
-test_src := max.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/utilities/time/time.traits/Android.mk b/test/utilities/time/time.traits/Android.mk
deleted file mode 100644
index 98a9435..0000000
--- a/test/utilities/time/time.traits/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/time/time.traits/Android.mk
-
-test_name := utilities/time/time.traits/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/utilities/time/time.traits/time.traits.duration_values/Android.mk b/test/utilities/time/time.traits/time.traits.duration_values/Android.mk
deleted file mode 100644
index d194e40..0000000
--- a/test/utilities/time/time.traits/time.traits.duration_values/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/time/time.traits/time.traits.duration_values/Android.mk
-
-test_name := utilities/time/time.traits/time.traits.duration_values/zero
-test_src := zero.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.traits/time.traits.duration_values/min
-test_src := min.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.traits/time.traits.duration_values/max
-test_src := max.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/utilities/time/time.traits/time.traits.is_fp/Android.mk b/test/utilities/time/time.traits/time.traits.is_fp/Android.mk
deleted file mode 100644
index 3abd551..0000000
--- a/test/utilities/time/time.traits/time.traits.is_fp/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/time/time.traits/time.traits.is_fp/Android.mk
-
-test_name := utilities/time/time.traits/time.traits.is_fp/treat_as_floating_point
-test_src := treat_as_floating_point.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/utilities/time/time.traits/time.traits.specializations/Android.mk b/test/utilities/time/time.traits/time.traits.specializations/Android.mk
deleted file mode 100644
index f6c54e5..0000000
--- a/test/utilities/time/time.traits/time.traits.specializations/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/time/time.traits/time.traits.specializations/Android.mk
-
-test_name := utilities/time/time.traits/time.traits.specializations/time_point
-test_src := time_point.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/time/time.traits/time.traits.specializations/duration
-test_src := duration.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/utilities/tuple/Android.mk b/test/utilities/tuple/Android.mk
deleted file mode 100644
index a37f764..0000000
--- a/test/utilities/tuple/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/tuple/Android.mk
-
-test_name := utilities/tuple/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/utilities/tuple/tuple.general/Android.mk b/test/utilities/tuple/tuple.general/Android.mk
deleted file mode 100644
index b087eaa..0000000
--- a/test/utilities/tuple/tuple.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/tuple/tuple.general/Android.mk
-
-test_name := utilities/tuple/tuple.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/utilities/tuple/tuple.tuple/Android.mk b/test/utilities/tuple/tuple.tuple/Android.mk
deleted file mode 100644
index b7c6eac..0000000
--- a/test/utilities/tuple/tuple.tuple/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/tuple/tuple.tuple/Android.mk
-
-test_name := utilities/tuple/tuple.tuple/empty_member
-test_src := empty_member.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/utilities/tuple/tuple.tuple/tuple.assign/Android.mk b/test/utilities/tuple/tuple.tuple/tuple.assign/Android.mk
deleted file mode 100644
index 617a1f2..0000000
--- a/test/utilities/tuple/tuple.tuple/tuple.assign/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/utilities/tuple/tuple.tuple/tuple.assign/Android.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.assign/convert_copy
-test_src := convert_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.assign/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.assign/convert_move
-test_src := convert_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.assign/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.assign/const_pair
-test_src := const_pair.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.assign/move_pair
-test_src := move_pair.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/utilities/tuple/tuple.tuple/tuple.cnstr/Android.mk b/test/utilities/tuple/tuple.tuple/tuple.cnstr/Android.mk
deleted file mode 100644
index e5ab571..0000000
--- a/test/utilities/tuple/tuple.tuple/tuple.cnstr/Android.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# 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/utilities/tuple/tuple.tuple/tuple.cnstr/Android.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy
-test_src := convert_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/alloc
-test_src := alloc.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes
-test_src := alloc_UTypes.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types
-test_src := alloc_const_Types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair
-test_src := alloc_move_pair.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move
-test_src := alloc_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/UTypes
-test_src := UTypes.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/copy
-test_src := copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/convert_move
-test_src := convert_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/move
-test_src := move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/const_pair
-test_src := const_pair.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy
-test_src := alloc_convert_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy
-test_src := alloc_copy.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/const_Types
-test_src := const_Types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move
-test_src := alloc_convert_move.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/move_pair
-test_src := move_pair.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair
-test_src := alloc_const_pair.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/utilities/tuple/tuple.tuple/tuple.creation/Android.mk b/test/utilities/tuple/tuple.tuple/tuple.creation/Android.mk
deleted file mode 100644
index 6856ece..0000000
--- a/test/utilities/tuple/tuple.tuple/tuple.creation/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/tuple/tuple.tuple/tuple.creation/Android.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple
-test_src := forward_as_tuple.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.creation/tie
-test_src := tie.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.creation/tuple_cat
-test_src := tuple_cat.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.creation/make_tuple
-test_src := make_tuple.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/utilities/tuple/tuple.tuple/tuple.elem/Android.mk b/test/utilities/tuple/tuple.tuple/tuple.elem/Android.mk
deleted file mode 100644
index 45a27c2..0000000
--- a/test/utilities/tuple/tuple.tuple/tuple.elem/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/tuple/tuple.tuple/tuple.elem/Android.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type
-test_src := tuple.by.type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.elem/get_const
-test_src := get_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.elem/get_non_const
-test_src := get_non_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.elem/get_rv
-test_src := get_rv.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/utilities/tuple/tuple.tuple/tuple.helper/Android.mk b/test/utilities/tuple/tuple.tuple/tuple.helper/Android.mk
deleted file mode 100644
index fbf7e9b..0000000
--- a/test/utilities/tuple/tuple.tuple/tuple.helper/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/tuple/tuple.tuple/tuple.helper/Android.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.helper/tuple_element
-test_src := tuple_element.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.helper/tuple_size
-test_src := tuple_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/utilities/tuple/tuple.tuple/tuple.rel/Android.mk b/test/utilities/tuple/tuple.tuple/tuple.rel/Android.mk
deleted file mode 100644
index 93ceb3e..0000000
--- a/test/utilities/tuple/tuple.tuple/tuple.rel/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/tuple/tuple.tuple/tuple.rel/Android.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.rel/lt
-test_src := lt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.rel/eq
-test_src := 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/utilities/tuple/tuple.tuple/tuple.special/Android.mk b/test/utilities/tuple/tuple.tuple/tuple.special/Android.mk
deleted file mode 100644
index aab71b1..0000000
--- a/test/utilities/tuple/tuple.tuple/tuple.special/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/tuple/tuple.tuple/tuple.special/Android.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.special/non_member_swap
-test_src := non_member_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/utilities/tuple/tuple.tuple/tuple.swap/Android.mk b/test/utilities/tuple/tuple.tuple/tuple.swap/Android.mk
deleted file mode 100644
index 93ed0ff..0000000
--- a/test/utilities/tuple/tuple.tuple/tuple.swap/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/tuple/tuple.tuple/tuple.swap/Android.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.swap/member_swap
-test_src := member_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/utilities/tuple/tuple.tuple/tuple.traits/Android.mk b/test/utilities/tuple/tuple.tuple/tuple.traits/Android.mk
deleted file mode 100644
index def42c1..0000000
--- a/test/utilities/tuple/tuple.tuple/tuple.traits/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/tuple/tuple.tuple/tuple.traits/Android.mk
-
-test_name := utilities/tuple/tuple.tuple/tuple.traits/uses_allocator
-test_src := uses_allocator.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/utilities/type.index/Android.mk b/test/utilities/type.index/Android.mk
deleted file mode 100644
index 5995938..0000000
--- a/test/utilities/type.index/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/type.index/Android.mk
-
-test_name := utilities/type.index/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/utilities/type.index/type.index.hash/Android.mk b/test/utilities/type.index/type.index.hash/Android.mk
deleted file mode 100644
index 28f6f37..0000000
--- a/test/utilities/type.index/type.index.hash/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/type.index/type.index.hash/Android.mk
-
-test_name := utilities/type.index/type.index.hash/hash
-test_src := hash.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/utilities/type.index/type.index.members/Android.mk b/test/utilities/type.index/type.index.members/Android.mk
deleted file mode 100644
index 48dee1e..0000000
--- a/test/utilities/type.index/type.index.members/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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/utilities/type.index/type.index.members/Android.mk
-
-test_name := utilities/type.index/type.index.members/hash_code
-test_src := hash_code.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/type.index/type.index.members/lt
-test_src := lt.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/type.index/type.index.members/name
-test_src := name.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/type.index/type.index.members/eq
-test_src := eq.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/type.index/type.index.members/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/utilities/type.index/type.index.overview/Android.mk b/test/utilities/type.index/type.index.overview/Android.mk
deleted file mode 100644
index 19686df..0000000
--- a/test/utilities/type.index/type.index.overview/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/type.index/type.index.overview/Android.mk
-
-test_name := utilities/type.index/type.index.overview/copy_ctor
-test_src := copy_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/type.index/type.index.overview/copy_assign
-test_src := copy_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/utilities/type.index/type.index.synopsis/Android.mk b/test/utilities/type.index/type.index.synopsis/Android.mk
deleted file mode 100644
index 43b0d82..0000000
--- a/test/utilities/type.index/type.index.synopsis/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/type.index/type.index.synopsis/Android.mk
-
-test_name := utilities/type.index/type.index.synopsis/hash_type_index
-test_src := hash_type_index.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/utilities/utilities.general/Android.mk b/test/utilities/utilities.general/Android.mk
deleted file mode 100644
index 4a4ebde..0000000
--- a/test/utilities/utilities.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/utilities.general/Android.mk
-
-test_name := utilities/utilities.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/utilities/utility.requirements/Android.mk b/test/utilities/utility.requirements/Android.mk
deleted file mode 100644
index e69e2f2..0000000
--- a/test/utilities/utility.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/utility.requirements/Android.mk
-
-test_name := utilities/utility.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/utilities/utility.requirements/allocator.requirements/Android.mk b/test/utilities/utility.requirements/allocator.requirements/Android.mk
deleted file mode 100644
index 887f4e6..0000000
--- a/test/utilities/utility.requirements/allocator.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/utility.requirements/allocator.requirements/Android.mk
-
-test_name := utilities/utility.requirements/allocator.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/utilities/utility.requirements/hash.requirements/Android.mk b/test/utilities/utility.requirements/hash.requirements/Android.mk
deleted file mode 100644
index c892c35..0000000
--- a/test/utilities/utility.requirements/hash.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/utility.requirements/hash.requirements/Android.mk
-
-test_name := utilities/utility.requirements/hash.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/utilities/utility.requirements/nullablepointer.requirements/Android.mk b/test/utilities/utility.requirements/nullablepointer.requirements/Android.mk
deleted file mode 100644
index 2a0334a..0000000
--- a/test/utilities/utility.requirements/nullablepointer.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/utility.requirements/nullablepointer.requirements/Android.mk
-
-test_name := utilities/utility.requirements/nullablepointer.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/utilities/utility.requirements/swappable.requirements/Android.mk b/test/utilities/utility.requirements/swappable.requirements/Android.mk
deleted file mode 100644
index d4270d1..0000000
--- a/test/utilities/utility.requirements/swappable.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/utility.requirements/swappable.requirements/Android.mk
-
-test_name := utilities/utility.requirements/swappable.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/utilities/utility.requirements/utility.arg.requirements/Android.mk b/test/utilities/utility.requirements/utility.arg.requirements/Android.mk
deleted file mode 100644
index e6d4db2..0000000
--- a/test/utilities/utility.requirements/utility.arg.requirements/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/utility.requirements/utility.arg.requirements/Android.mk
-
-test_name := utilities/utility.requirements/utility.arg.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/utilities/utility/Android.mk b/test/utilities/utility/Android.mk
deleted file mode 100644
index 011e9f3..0000000
--- a/test/utilities/utility/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/utility/Android.mk
-
-test_name := utilities/utility/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/utilities/utility/declval/Android.mk b/test/utilities/utility/declval/Android.mk
deleted file mode 100644
index b42c379..0000000
--- a/test/utilities/utility/declval/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/utility/declval/Android.mk
-
-test_name := utilities/utility/declval/declval
-test_src := declval.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/utilities/utility/exchange/Android.mk b/test/utilities/utility/exchange/Android.mk
deleted file mode 100644
index a96651d..0000000
--- a/test/utilities/utility/exchange/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/utility/exchange/Android.mk
-
-test_name := utilities/utility/exchange/exchange
-test_src := exchange.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/utilities/utility/forward/Android.mk b/test/utilities/utility/forward/Android.mk
deleted file mode 100644
index 36619bc..0000000
--- a/test/utilities/utility/forward/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/utilities/utility/forward/Android.mk
-
-test_name := utilities/utility/forward/forward
-test_src := forward.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/forward/move_if_noexcept
-test_src := move_if_noexcept.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/forward/move_only
-test_src := move_only.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/forward/move_copy
-test_src := move_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/utilities/utility/operators/Android.mk b/test/utilities/utility/operators/Android.mk
deleted file mode 100644
index c8d17ae..0000000
--- a/test/utilities/utility/operators/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/utility/operators/Android.mk
-
-test_name := utilities/utility/operators/rel_ops
-test_src := rel_ops.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/utilities/utility/pairs/Android.mk b/test/utilities/utility/pairs/Android.mk
deleted file mode 100644
index 6531d08..0000000
--- a/test/utilities/utility/pairs/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/utility/pairs/Android.mk
-
-test_name := utilities/utility/pairs/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/utilities/utility/pairs/pair.astuple/Android.mk b/test/utilities/utility/pairs/pair.astuple/Android.mk
deleted file mode 100644
index c6286fb..0000000
--- a/test/utilities/utility/pairs/pair.astuple/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# 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/utilities/utility/pairs/pair.astuple/Android.mk
-
-test_name := utilities/utility/pairs/pair.astuple/pairs.by.type
-test_src := pairs.by.type.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pair.astuple/tuple_element
-test_src := tuple_element.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pair.astuple/tuple_size
-test_src := tuple_size.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pair.astuple/get_const
-test_src := get_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pair.astuple/get_non_const
-test_src := get_non_const.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pair.astuple/get_rv
-test_src := get_rv.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/utilities/utility/pairs/pair.piecewise/Android.mk b/test/utilities/utility/pairs/pair.piecewise/Android.mk
deleted file mode 100644
index d011e7e..0000000
--- a/test/utilities/utility/pairs/pair.piecewise/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/utility/pairs/pair.piecewise/Android.mk
-
-test_name := utilities/utility/pairs/pair.piecewise/piecewise_construct
-test_src := piecewise_construct.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/utilities/utility/pairs/pairs.general/Android.mk b/test/utilities/utility/pairs/pairs.general/Android.mk
deleted file mode 100644
index 33dd49b..0000000
--- a/test/utilities/utility/pairs/pairs.general/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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/utilities/utility/pairs/pairs.general/Android.mk
-
-test_name := utilities/utility/pairs/pairs.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/utilities/utility/pairs/pairs.pair/Android.mk b/test/utilities/utility/pairs/pairs.pair/Android.mk
deleted file mode 100644
index e569bd5..0000000
--- a/test/utilities/utility/pairs/pairs.pair/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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/utilities/utility/pairs/pairs.pair/Android.mk
-
-test_name := utilities/utility/pairs/pairs.pair/default
-test_src := default.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pairs.pair/const_first_const_second
-test_src := const_first_const_second.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pairs.pair/copy_ctor
-test_src := copy_ctor.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pairs.pair/assign_rv_pair
-test_src := assign_rv_pair.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pairs.pair/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pairs.pair/assign_const_pair_U_V
-test_src := assign_const_pair_U_V.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pairs.pair/const_pair_U_V
-test_src := const_pair_U_V.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V
-test_src := assign_rv_pair_U_V.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pairs.pair/rv_pair_U_V
-test_src := rv_pair_U_V.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pairs.pair/piecewise
-test_src := piecewise.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pairs.pair/types
-test_src := types.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pairs.pair/U_V
-test_src := U_V.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/utilities/utility/pairs/pairs.spec/Android.mk b/test/utilities/utility/pairs/pairs.spec/Android.mk
deleted file mode 100644
index 4379a5c..0000000
--- a/test/utilities/utility/pairs/pairs.spec/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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/utilities/utility/pairs/pairs.spec/Android.mk
-
-test_name := utilities/utility/pairs/pairs.spec/make_pair
-test_src := make_pair.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pairs.spec/comparison
-test_src := comparison.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/pairs/pairs.spec/non_member_swap
-test_src := non_member_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/utilities/utility/utility.swap/Android.mk b/test/utilities/utility/utility.swap/Android.mk
deleted file mode 100644
index a9ba3ea..0000000
--- a/test/utilities/utility/utility.swap/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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/utilities/utility/utility.swap/Android.mk
-
-test_name := utilities/utility/utility.swap/swap
-test_src := swap.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-test_name := utilities/utility/utility.swap/swap_array
-test_src := swap_array.pass.cpp
-include external/libcxx/test/Android.build.mk
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file