diff options
author | Florian Dold <florian.dold@gmail.com> | 2019-08-07 21:02:07 +0200 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2019-08-07 22:51:27 +0200 |
commit | d057eea48480d1ddaaec76e81188e28d6a5c20fe (patch) | |
tree | cc39ccaf08d8ea73f0661afdf3daba8338fbbb1b /deps/v8/build/config/android/rules.gni | |
parent | 65e39b7046a29aa299f06285441b62bcf1e4df01 (diff) | |
download | android-node-v8-d057eea48480d1ddaaec76e81188e28d6a5c20fe.tar.gz android-node-v8-d057eea48480d1ddaaec76e81188e28d6a5c20fe.tar.bz2 android-node-v8-d057eea48480d1ddaaec76e81188e28d6a5c20fe.zip |
Revert "Remove build code related to the NDK's libc++"
This reverts commit e93ee685fe2ba67f050a6b3628d8754f96e6306b.
Diffstat (limited to 'deps/v8/build/config/android/rules.gni')
-rw-r--r-- | deps/v8/build/config/android/rules.gni | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/deps/v8/build/config/android/rules.gni b/deps/v8/build/config/android/rules.gni index 4846ade15c..0337663b4b 100644 --- a/deps/v8/build/config/android/rules.gni +++ b/deps/v8/build/config/android/rules.gni @@ -70,6 +70,9 @@ template("create_native_executable_dist") { if (defined(invoker.deps)) { data_deps += invoker.deps } + if (is_component_build || is_asan) { + data_deps += [ "//build/android:cpplib_stripped" ] + } write_runtime_deps = _runtime_deps_file } @@ -2191,6 +2194,17 @@ if (enable_java_templates) { defined(invoker.secondary_abi_shared_libraries) && invoker.secondary_abi_shared_libraries != [] + if (is_component_build || is_asan) { + if (_shared_libraries_is_valid) { + _native_libs_deps += [ "//build/android:cpplib_stripped" ] + } + if (_secondary_abi_shared_libraries_is_valid) { + _secondary_abi_native_libs_deps += [ + "//build/android:cpplib_stripped($android_secondary_abi_toolchain)", + ] + } + } + if (_shared_libraries_is_valid) { _native_libs_deps += invoker.shared_libraries |