libcxx: Update Android.bp to match Android.mk
Change-Id: Iffe0b0c13a23d15a6cc2c7805fc4f99477e230a4
diff --git a/Android.bp b/Android.bp
index d05a920..7d01993 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,58 +14,47 @@
// limitations under the License.
//
-LIBCXX_SRC_FILES = [
- "src/algorithm.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",
-]
-
-LIBCXX_C_INCLUDES = [
- "external/libcxxabi/include",
-]
-
-LIBCXX_LOCAL_C_INCLUDES = [
- "include/",
-]
-
-LIBCXX_CPPFLAGS = [
- "-std=c++14",
- "-nostdinc++",
- "-fexceptions",
-]
-
// host + device static lib
cc_library_static {
host_supported: true,
name: "libc++_static",
clang: true,
- srcs: LIBCXX_SRC_FILES,
- include_dirs: LIBCXX_C_INCLUDES,
- local_include_dirs: LIBCXX_LOCAL_C_INCLUDES,
- cppflags: LIBCXX_CPPFLAGS,
+ 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",
+ ],
rtti: true,
whole_static_libs: [
"libc++abi",