diff options
author | eugenis <eugenis@chromium.org> | 2015-08-03 21:57:52 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-04 04:59:31 +0000 |
commit | 301af9347c32ac621ab06b08eb089f8ee643795f (patch) | |
tree | 90f8a162a11347dffc55c2b5178d6fdf21b4b660 /build/java_apk.gypi | |
parent | 0112f1037b342f1f1718c8615e9a17559b1bdfde (diff) | |
download | chromium_src-301af9347c32ac621ab06b08eb089f8ee643795f.zip chromium_src-301af9347c32ac621ab06b08eb089f8ee643795f.tar.gz chromium_src-301af9347c32ac621ab06b08eb089f8ee643795f.tar.bz2 |
Link libc++_shared with asan=1 on Android.
ASan needs to interpose operator new/delete symbols to provide good
allocation/deallocation stacks. This requires shared linking of the
C++ standard library.
BUG=515261
Review URL: https://codereview.chromium.org/1263713005
Cr-Commit-Position: refs/heads/master@{#341675}
Diffstat (limited to 'build/java_apk.gypi')
-rw-r--r-- | build/java_apk.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/java_apk.gypi b/build/java_apk.gypi index ff837c3..a1fc857 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -247,7 +247,7 @@ 'additional_R_text_files': ['<(intermediate_dir)/R.txt'], }, }], - ['native_lib_target != "" and component == "shared_library"', { + ['native_lib_target != "" and android_must_copy_system_libraries == 1', { 'dependencies': [ '<(DEPTH)/build/android/setup.gyp:copy_system_libraries', ], |