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