Merge changes Ide5595c6,Icf56f2a1 am: 2f8503675a am: 8962769dde am: 1be15faa40

am: 5f0e1d2990

Change-Id: I2d3bdf0e05e1da8a2867f87fdf0310629b581009

3 files changed, 1 insertions, 201 deletions

diff --git a/gen_blueprints.py b/gen_blueprints.py
index 83f7e9b42..cfa3ade7f 100755
--- a/gen_blueprints.py
+++ b/gen_blueprints.py
@@ -79,7 +79,7 @@ def main():
         'crtend_android.o'))
 
     with open(local_path('Android.bp'), 'w') as bpfile:
-        bpfile.write('// THIS FILE IS AUTOGENERATED BY gen-blueprints.py\n')
+        bpfile.write('// THIS FILE IS AUTOGENERATED BY gen_blueprints.py\n')
         bpfile.write('// DO NOT EDIT\n')
         bpfile.write('\n')
         bpfile.write('\n\n'.join(blueprints))
diff --git a/r13/sources/cxx-stl/llvm-libc++/Android.bp b/r13/sources/cxx-stl/llvm-libc++/Android.bp
deleted file mode 100644
index bf9ee5841..000000000
--- a/r13/sources/cxx-stl/llvm-libc++/Android.bp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (C) 2014 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// host + device static lib
-cc_library_static {
-    host_supported: true,
-    name: "libc++_static",
-    clang: true,
-    srcs: [
-        "src/algorithm.cpp",
-        "src/any.cpp",
-        "src/bind.cpp",
-        "src/chrono.cpp",
-        "src/condition_variable.cpp",
-        "src/debug.cpp",
-        "src/exception.cpp",
-        "src/future.cpp",
-        "src/hash.cpp",
-        "src/ios.cpp",
-        "src/iostream.cpp",
-        "src/locale.cpp",
-        "src/memory.cpp",
-        "src/mutex.cpp",
-        "src/new.cpp",
-        "src/optional.cpp",
-        "src/random.cpp",
-        "src/regex.cpp",
-        "src/shared_mutex.cpp",
-        "src/stdexcept.cpp",
-        "src/string.cpp",
-        "src/strstream.cpp",
-        "src/system_error.cpp",
-        "src/thread.cpp",
-        "src/typeinfo.cpp",
-        "src/utility.cpp",
-        "src/valarray.cpp",
-    ],
-    local_include_dirs: ["include"],
-    export_include_dirs: ["include"],
-    cppflags: [
-        "-std=c++14",
-        "-nostdinc++",
-        "-fexceptions",
-        "-DLIBCXX_BUILDING_LIBCXXABI",
-    ],
-    rtti: true,
-    whole_static_libs: [
-        "libc++abi",
-    ],
-    stl: "none",
-}
-
-// host + device dynamic lib
-cc_library_shared {
-    host_supported: true,
-    name: "libc++",
-    clang: true,
-    whole_static_libs: ["libc++_static"],
-    stl: "none",
-
-    target: {
-        android: {
-            shared_libs: ["libdl"],
-        },
-        android_arm: {
-            static_libs: ["libunwind_llvm"],
-            ldflags: ["-Wl,--exclude-libs,libunwind_llvm.a"],
-        },
-        host: {
-            ldflags: ["-nodefaultlibs"],
-        },
-        darwin: {
-            unexported_symbols_list: "lib/libc++unexp.exp",
-            force_symbols_not_weak_list: "lib/notweak.exp",
-            force_symbols_weak_list: "lib/weak.exp",
-        },
-
-        linux: {
-            host_ldlibs: [
-                "-lrt",
-                "-lpthread",
-                "-ldl",
-            ],
-        },
-    },
-}
-
-
-// ANDROIDMK TRANSLATION ERROR: unsupported conditional
-// ifdef LIBCXX_TESTING
-// ANDROIDMK TRANSLATION ERROR: unsupported include
-// include $(LOCAL_PATH)/buildcmds/Android.mk
-
-// ANDROIDMK TRANSLATION ERROR: endif from unsupported contitional
-// endif
-// TARGET_BUILD_APPS
-
diff --git a/r13/sources/cxx-stl/llvm-libc++abi/Android.bp b/r13/sources/cxx-stl/llvm-libc++abi/Android.bp
deleted file mode 100644
index e8eddbeba..000000000
--- a/r13/sources/cxx-stl/llvm-libc++abi/Android.bp
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (C) 2014 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-cc_library_static {
-    name: "libc++abi",
-    host_supported: true,
-    clang: true,
-    srcs: [
-        "src/abort_message.cpp",
-        "src/cxa_aux_runtime.cpp",
-        "src/cxa_default_handlers.cpp",
-        "src/cxa_demangle.cpp",
-        "src/cxa_exception.cpp",
-        "src/cxa_exception_storage.cpp",
-        "src/cxa_guard.cpp",
-        "src/cxa_handlers.cpp",
-        "src/cxa_new_delete.cpp",
-        "src/cxa_personality.cpp",
-        "src/cxa_thread_atexit.cpp",
-        "src/cxa_unexpected.cpp",
-        "src/cxa_vector.cpp",
-        "src/cxa_virtual.cpp",
-        "src/exception.cpp",
-        "src/private_typeinfo.cpp",
-        "src/stdexcept.cpp",
-        "src/typeinfo.cpp",
-    ],
-    include_dirs: ["external/libcxx/include"],
-    local_include_dirs:  ["include"],
-    export_include_dirs: ["include"],
-    cppflags: [
-        "-std=c++14",
-        "-fexceptions",
-        "-Wall",
-        "-Wextra",
-        "-Wno-unused-function",
-        "-Werror",
-    ],
-    sanitize: {
-        never: true,
-    },
-    stl: "none",
-    rtti: true,
-    arch: {
-        arm: {
-            include_dirs: ["external/libunwind_llvm/include"],
-            cppflags: ["-DLIBCXXABI_USE_LLVM_UNWINDER=1"],
-        },
-        arm64: {
-            cppflags: ["-DLIBCXXABI_USE_LLVM_UNWINDER=0"],
-        },
-        mips: {
-            cppflags: ["-DLIBCXXABI_USE_LLVM_UNWINDER=0"],
-        },
-        mips64: {
-            cppflags: ["-DLIBCXXABI_USE_LLVM_UNWINDER=0"],
-        },
-        x86: {
-            cppflags: ["-DLIBCXXABI_USE_LLVM_UNWINDER=0"],
-        },
-        x86_64: {
-            cppflags: ["-DLIBCXXABI_USE_LLVM_UNWINDER=0"],
-        },
-    },
-    target: {
-        android: {
-            cppflags: ["-DHAVE___CXA_THREAD_ATEXIT_IMPL"],
-        },
-        darwin: {
-            // libcxxabi really doesn't like the non-LLVM assembler on Darwin
-            asflags: ["-integrated-as"],
-            cflags: ["-integrated-as"],
-            cppflags: ["-integrated-as"],
-        },
-    },
-
-}