From d057eea48480d1ddaaec76e81188e28d6a5c20fe Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 7 Aug 2019 21:02:07 +0200
Subject: Revert "Remove build code related to the NDK's libc++"

This reverts commit e93ee685fe2ba67f050a6b3628d8754f96e6306b.
---
 deps/v8/build/android/BUILD.gn | 46 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'deps/v8/build/android/BUILD.gn')

diff --git a/deps/v8/build/android/BUILD.gn b/deps/v8/build/android/BUILD.gn
index f864430562..78b51a4e77 100644
--- a/deps/v8/build/android/BUILD.gn
+++ b/deps/v8/build/android/BUILD.gn
@@ -72,6 +72,52 @@ python_library("devil_chromium_py") {
   ]
 }
 
+# Copy to the lib.unstripped directory so that gdb can easily find it.
+copy("cpplib_unstripped") {
+  _soname = "libc++_shared.so"
+  sources = [
+    "${android_libcpp_lib_dir}/${_soname}",
+  ]
+  outputs = [
+    "${root_out_dir}/lib.unstripped/${_soname}",
+  ]
+}
+
+action("cpplib_stripped") {
+  _strip_bin = "${android_tool_prefix}strip"
+  _soname = "libc++_shared.so"
+  _input_so = "${root_out_dir}/lib.unstripped/${_soname}"
+  _output_so = "${root_out_dir}/${_soname}"
+
+  deps = [
+    ":cpplib_unstripped",
+  ]
+
+  script = "//build/gn_run_binary.py"
+  inputs = [
+    _strip_bin,
+  ]
+  sources = [
+    _input_so,
+  ]
+  outputs = [
+    _output_so,
+  ]
+  data = [
+    _output_so,
+  ]
+
+  _rebased_strip_bin = rebase_path(_strip_bin, root_build_dir)
+  _rebased_input_so = rebase_path(_input_so, root_build_dir)
+  _rebased_output_so = rebase_path(_output_so, root_build_dir)
+  args = [
+    _rebased_strip_bin,
+    "-o",
+    _rebased_output_so,
+    _rebased_input_so,
+  ]
+}
+
 python_library("test_runner_py") {
   pydeps_file = "test_runner.pydeps"
   data = [
-- 
cgit v1.2.3