Revert "Compile libcxx and libcxxabi (#190)" (#191)

This reverts commit 98cd682.

build/config/BUILDCONFIG.gn

@@ -632,31 +632,6 @@ if (custom_toolchain != "") {
   }
 }
 
-# Sets default dependencies for executable and shared_library targets.
-#
-# Variables
-#   no_default_deps: If true, no standard dependencies will be added.
-if (is_android) {
-  foreach(_target_type,
-          [
-            "executable",
-            "loadable_module",
-            "shared_library",
-          ]) {
-    template(_target_type) {
-      target(_target_type, target_name) {
-        forward_variables_from(invoker, "*", [ "no_default_deps" ])
-        if (!defined(deps)) {
-          deps = []
-        }
-        if (!defined(invoker.no_default_deps) || !invoker.no_default_deps) {
-          deps += [ "//third_party/libcxx" ]
-        }
-      }
-    }
-  }
-}
-
 # ==============================================================================
 # COMPONENT SETUP
 # ==============================================================================

build/config/compiler/BUILD.gn

@@ -520,6 +520,10 @@ config("runtime_library") {
     # strange errors. The include ordering here is important; change with
     # caution.
     cflags += [
+      "-isystem" + rebase_path("$android_libcpp_root/include", root_build_dir),
+      "-isystem" + rebase_path(
+              "$android_ndk_root/sources/cxx-stl/llvm-libc++abi/include",
+              root_build_dir),
       "-isystem" +
           rebase_path("$android_ndk_root/sources/android/support/include",
                       root_build_dir),
@@ -529,14 +533,13 @@ config("runtime_library") {
       "-D__ANDROID_API__=$android_api_level",
     ]
 
-    include_dirs = [
-      "//third_party/libcxx/include",
-      "//third_party/libcxxabi/include",
-    ]
-
-    # libunwind and libandroid_support also live in $android_libcpp_root.
     lib_dirs += [ "$android_libcpp_root/libs/$android_app_abi" ]
 
+    libs += [
+      "$android_libcpp_library",
+      "c++abi",
+    ]
+
     if (android_api_level < 21) {
       libs += [ "android_support" ]
     }