Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4809)

Unified Diff: build/config/android/rules.gni

Issue 1496283003: Port android_must_copy_system_libraries logic GYP->GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/android/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index f4219f23b66a62087c3be6e7f365dc2793f86c73..43e9e7f39282a047a64f178d7c41391b5fab1693 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -5,6 +5,7 @@
import("//base/android/linker/config.gni")
import("//build/config/android/config.gni")
import("//build/config/android/internal_rules.gni")
+import("//build/config/sanitizers/sanitizers.gni")
import("//build/toolchain/toolchain.gni")
import("//third_party/android_platform/config.gni")
import("//tools/grit/grit_rule.gni")
@@ -1323,7 +1324,7 @@ template("android_apk") {
_native_libs_deps = []
if (defined(invoker.native_libs) && invoker.native_libs != []) {
- if (is_component_build) {
+ if (is_component_build || is_asan) {
_native_libs += [ "$root_shlib_dir/libc++_shared.so" ]
_native_libs_deps += [ "//build/android:cpplib_stripped" ]
}
« no previous file with comments | « build/config/android/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698