From 21b620c37be31c28586c2ae195bae35a45c114eb Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Mon, 8 Jan 2018 17:16:00 -0500 Subject: switch android builds to libc++ All other options are going away real soon now. Change-Id: I57051fdabc2b0fd18fd133c9fb345ffa5a46e5db Reviewed-on: https://skia-review.googlesource.com/92300 Reviewed-by: Florin Malita Commit-Queue: Mike Klein --- gn/BUILD.gn | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gn/BUILD.gn') diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 7d2bff14ec..87d24b0534 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -141,9 +141,9 @@ config("default") { "--target=$ndk_target", ] cflags_cc += [ + "-isystem$ndk/sources/cxx-stl/llvm-libc++/include", + "-isystem$ndk/sources/cxx-stl/llvm-libc++abi/include", "-isystem$ndk/sources/android/support/include", - "-isystem$ndk/sources/cxx-stl/gnu-libstdc++/4.9/include", - "-isystem$ndk/sources/cxx-stl/gnu-libstdc++/4.9/libs/$ndk_stdlib/include", ] ldflags += [ "--sysroot=$ndk/platforms/$ndk_platform", @@ -151,11 +151,15 @@ config("default") { "-B$ndk/toolchains/$ndk_gccdir-4.9/prebuilt/$ndk_host/$ndk_target/bin", ] lib_dirs = [ - "$ndk/sources/cxx-stl/gnu-libstdc++/4.9/libs/$ndk_stdlib", + "$ndk/sources/cxx-stl/llvm-libc++/libs/$ndk_stdlib", "$ndk/toolchains/$ndk_gccdir-4.9/prebuilt/$ndk_host/lib/gcc/$ndk_target/4.9.x", ] - libs += [ "gnustl_static" ] + libs += [ + "c++_static", + "c++abi", + "android_support", + ] } if (is_ios) { -- cgit v1.2.3