Adds a basic test wrapper for Android To run libc++ tests: $ mm $ adb sync $ python runtests.py # runs all host and device tests # see main() for command line options To regenerate all makefiles: $ python makemake.py Change-Id: Ibad78ad8e1bd45f32730d281afa53c2cec55478f

commit: 6f56ab789cb470620554d624c37f488285b3b04e [log] [tgz]
author: Dan Albert <danalbert@google.com> Tue May 06 14:12:12 2014 -0700
committer: Dan Albert <danalbert@google.com> Mon May 12 16:02:43 2014 -0700
tree: 94b24dad537044b02e3e4539356aecc22bd15499
parent: 7d57f1bbe2a5e91a6ec904da37f36791856cb93c [diff]
diff --git a/test/strings/Android.mk b/test/strings/Android.mk
new file mode 100644
index 0000000..2d2e59c
--- /dev/null
+++ b/test/strings/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..17ebf64
--- /dev/null
+++ b/test/strings/basic.string.hash/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..cf87b68
--- /dev/null
+++ b/test/strings/basic.string.literals/Android.mk

@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..456eea4
--- /dev/null
+++ b/test/strings/basic.string/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..d920156
--- /dev/null
+++ b/test/strings/basic.string/string.access/Android.mk

@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..292e165
--- /dev/null
+++ b/test/strings/basic.string/string.capacity/Android.mk

@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..837bcdd
--- /dev/null
+++ b/test/strings/basic.string/string.cons/Android.mk

@@ -0,0 +1,99 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..d1c5d9e
--- /dev/null
+++ b/test/strings/basic.string/string.iterators/Android.mk

@@ -0,0 +1,83 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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
new file mode 100644
index 0000000..7cb16e0
--- /dev/null
+++ b/test/strings/basic.string/string.modifiers/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..5dc0235
--- /dev/null
+++ b/test/strings/basic.string/string.modifiers/string_append/Android.mk

@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..4258f3a
--- /dev/null
+++ b/test/strings/basic.string/string.modifiers/string_assign/Android.mk

@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..7146d1e
--- /dev/null
+++ b/test/strings/basic.string/string.modifiers/string_copy/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..e96e758
--- /dev/null
+++ b/test/strings/basic.string/string.modifiers/string_erase/Android.mk

@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..914342d
--- /dev/null
+++ b/test/strings/basic.string/string.modifiers/string_insert/Android.mk

@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..65e6300
--- /dev/null
+++ b/test/strings/basic.string/string.modifiers/string_op_plus_equal/Android.mk

@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..23c583b
--- /dev/null
+++ b/test/strings/basic.string/string.modifiers/string_replace/Android.mk

@@ -0,0 +1,63 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..b2213fe
--- /dev/null
+++ b/test/strings/basic.string/string.modifiers/string_swap/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..faa8721
--- /dev/null
+++ b/test/strings/basic.string/string.nonmembers/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..c9301e7
--- /dev/null
+++ b/test/strings/basic.string/string.nonmembers/string.io/Android.mk

@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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
new file mode 100644
index 0000000..5d9262b
--- /dev/null
+++ b/test/strings/basic.string/string.nonmembers/string.special/Android.mk

@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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"
new file mode 100644
index 0000000..d486f4e
--- /dev/null
+++ "b/test/strings/basic.string/string.nonmembers/string_op\041=/Android.mk"

@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..bb52d4a
--- /dev/null
+++ b/test/strings/basic.string/string.nonmembers/string_op+/Android.mk

@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..445d3da
--- /dev/null
+++ b/test/strings/basic.string/string.nonmembers/string_operator==/Android.mk

@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..6887a69
--- /dev/null
+++ b/test/strings/basic.string/string.nonmembers/string_opgt/Android.mk

@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..8699e02
--- /dev/null
+++ b/test/strings/basic.string/string.nonmembers/string_opgt=/Android.mk

@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..92723c5
--- /dev/null
+++ b/test/strings/basic.string/string.nonmembers/string_oplt/Android.mk

@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..df4f51d
--- /dev/null
+++ b/test/strings/basic.string/string.nonmembers/string_oplt=/Android.mk

@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..2173ccb
--- /dev/null
+++ b/test/strings/basic.string/string.ops/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..f71fa27
--- /dev/null
+++ b/test/strings/basic.string/string.ops/string.accessors/Android.mk

@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..baa4659
--- /dev/null
+++ b/test/strings/basic.string/string.ops/string_compare/Android.mk

@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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
new file mode 100644
index 0000000..5780b32
--- /dev/null
+++ b/test/strings/basic.string/string.ops/string_find.first.not.of/Android.mk

@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..4ec05a3
--- /dev/null
+++ b/test/strings/basic.string/string.ops/string_find.first.of/Android.mk

@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..4d12ae7
--- /dev/null
+++ b/test/strings/basic.string/string.ops/string_find.last.not.of/Android.mk

@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..e1259d2
--- /dev/null
+++ b/test/strings/basic.string/string.ops/string_find.last.of/Android.mk

@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..5a56952
--- /dev/null
+++ b/test/strings/basic.string/string.ops/string_find/Android.mk

@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..10e9449
--- /dev/null
+++ b/test/strings/basic.string/string.ops/string_rfind/Android.mk

@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..0d0e6d8
--- /dev/null
+++ b/test/strings/basic.string/string.ops/string_substr/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..f520d42
--- /dev/null
+++ b/test/strings/basic.string/string.require/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..4280fe0
--- /dev/null
+++ b/test/strings/c.strings/Android.mk

@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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_cuchar
+test_src := version_cuchar.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
+
+test_name := strings/c.strings/cuchar
+test_src := cuchar.pass.cpp
+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/Android.mk b/test/strings/char.traits/Android.mk
new file mode 100644
index 0000000..864cf3c
--- /dev/null
+++ b/test/strings/char.traits/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..27959e0
--- /dev/null
+++ b/test/strings/char.traits/char.traits.require/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..c596daf
--- /dev/null
+++ b/test/strings/char.traits/char.traits.specializations/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..7679149
--- /dev/null
+++ b/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/Android.mk

@@ -0,0 +1,79 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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
new file mode 100644
index 0000000..691de5d
--- /dev/null
+++ b/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/Android.mk

@@ -0,0 +1,79 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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
new file mode 100644
index 0000000..1f7817b
--- /dev/null
+++ b/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/Android.mk

@@ -0,0 +1,79 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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
new file mode 100644
index 0000000..287751e
--- /dev/null
+++ b/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/Android.mk

@@ -0,0 +1,79 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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
new file mode 100644
index 0000000..cf4a776
--- /dev/null
+++ b/test/strings/char.traits/char.traits.typedefs/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..18411d9
--- /dev/null
+++ b/test/strings/string.classes/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..db1810a
--- /dev/null
+++ b/test/strings/string.conversions/Android.mk

@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
new file mode 100644
index 0000000..263cff3
--- /dev/null
+++ b/test/strings/strings.general/Android.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+test_makefile := external/libcxx/test/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
commit	6f56ab789cb470620554d624c37f488285b3b04e	[log] [tgz]
author	Dan Albert <danalbert@google.com>	Tue May 06 14:12:12 2014 -0700
committer	Dan Albert <danalbert@google.com>	Mon May 12 16:02:43 2014 -0700
tree	94b24dad537044b02e3e4539356aecc22bd15499
parent	7d57f1bbe2a5e91a6ec904da37f36791856cb93c [diff]