From 090bbcaa361eb158e8bfc5e6950081cb9679e350 Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Wed, 17 Jul 2019 20:30:27 +0000 Subject: Remove Android.bp files These files are never intended to be shipped as part of ndk. Cherry-picked from a867cc2416e18eb71d724f8b4fb84512f3c26fe1 in r19 branch of NDK. Test: none Bug: 131328001 --- python-packages/Android.bp | 28 --------- sources/cxx-stl/llvm-libc++abi/Android.bp | 91 ------------------------------ sources/third_party/googletest/Android.bp | 94 ------------------------------- 3 files changed, 213 deletions(-) delete mode 100644 python-packages/Android.bp delete mode 100644 sources/cxx-stl/llvm-libc++abi/Android.bp delete mode 100644 sources/third_party/googletest/Android.bp diff --git a/python-packages/Android.bp b/python-packages/Android.bp deleted file mode 100644 index db7d98c..0000000 --- a/python-packages/Android.bp +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (C) 2017 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -python_library_host { - name: "adb_py", - srcs: [ - "adb/*.py", - ], - version: { - py2: { - enabled: true, - }, - py3: { - enabled: false, - }, - }, -} diff --git a/sources/cxx-stl/llvm-libc++abi/Android.bp b/sources/cxx-stl/llvm-libc++abi/Android.bp deleted file mode 100644 index d9e8617..0000000 --- a/sources/cxx-stl/llvm-libc++abi/Android.bp +++ /dev/null @@ -1,91 +0,0 @@ -// -// Copyright (C) 2014 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -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/fallback_malloc.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"], - }, - }, - -} diff --git a/sources/third_party/googletest/Android.bp b/sources/third_party/googletest/Android.bp deleted file mode 100644 index 4bd5103..0000000 --- a/sources/third_party/googletest/Android.bp +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright (C) 2016 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT 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_defaults { - name: "libgtest_defaults", - export_include_dirs: ["include"], - cflags: ["-Wall", "-Werror", "-Wno-unused-private-field"], -} - -cc_defaults { - name: "libgtest_host_defaults", - target: { - linux_bionic: { - enabled: true, - }, - windows: { - enabled: true, - }, - }, -} - -// NDK libraries. -// We need to build one pair of (libgtest, libgtest_main) for each of the three -// STLs we support in the NDK since the user's app might use any of them. - -// libc++ -cc_library_static { - name: "libgtest_ndk_c++", - defaults: ["libgtest_defaults"], - sdk_version: "9", - stl: "c++_static", - srcs: ["src/gtest-all.cc"], -} - -cc_library_static { - name: "libgtest_main_ndk_c++", - defaults: ["libgtest_defaults"], - sdk_version: "9", - stl: "c++_static", - srcs: ["src/gtest_main.cc"], -} - -// Platform and host libraries. -cc_library_static { - name: "libgtest", - defaults: ["libgtest_defaults", "libgtest_host_defaults"], - host_supported: true, - vendor_available: true, - srcs: ["src/gtest-all.cc"], - rtti: true, -} - -cc_library_static { - name: "libgtest_main", - defaults: ["libgtest_defaults", "libgtest_host_defaults"], - host_supported: true, - vendor_available: true, - srcs: ["src/gtest_main.cc"], -} - -// Legacy libraries for makefiles that refer to libgtest_host -cc_library_host_static { - name: "libgtest_host", - whole_static_libs: ["libgtest"], - defaults: ["libgtest_host_defaults"], -} - -cc_library_host_static { - name: "libgtest_main_host", - whole_static_libs: ["libgtest_main"], - defaults: ["libgtest_host_defaults"], -} - -cc_library { - name: "libgtest_prod", - defaults: ["libgtest_defaults", "libgtest_host_defaults"], - host_supported: true, - recovery_available: true, - vendor_available: true, - export_include_dirs: ["include"], -} - -// Tests are in the Android.mk. Run with external/googletest/run_tests.py. -- cgit v1.2.3