From 32e4687af7a2c78f2822940f52bea0f4a1a451c7 Mon Sep 17 00:00:00 2001 From: "glider@chromium.org" Date: Tue, 28 Feb 2012 07:27:58 +0000 Subject: [PATCH] Allow to override the location of ASan blacklist. This is needed to build a CrOS binary, because the buildsystem doesn't play well with relative paths. BUG=chromium-os:26919 Review URL: https://chromiumcodereview.appspot.com/9479002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@123935 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- common.gypi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index e1081dcda..34bd17575 100644 --- a/common.gypi +++ b/common.gypi @@ -208,6 +208,7 @@ # -faddress-sanitizer only works with clang, but asan=1 implies clang=1 # See https://sites.google.com/a/chromium.org/dev/developers/testing/addresssanitizer 'asan%': 0, + 'asan_blacklist%': '<(PRODUCT_DIR)/../../third_party/asan/ignore.txt', # Use the provided profiled order file to link Chrome image with it. # This makes Chrome faster by better using CPU cache when executing code. @@ -458,6 +459,7 @@ 'notifications%': '<(notifications)', 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 'asan%': '<(asan)', + 'asan_blacklist%': '<(asan_blacklist)', 'order_text_section%': '<(order_text_section)', 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 'enable_web_intents%': '<(enable_web_intents)', @@ -1964,7 +1966,7 @@ '-faddress-sanitizer', '-fno-omit-frame-pointer', '-w', - '-mllvm', '-asan-blacklist=<(PRODUCT_DIR)/../../third_party/asan/ignore.txt', + '-mllvm', '-asan-blacklist=<(asan_blacklist)', ], 'ldflags': [ '-faddress-sanitizer', @@ -2387,7 +2389,7 @@ 'OTHER_CFLAGS': [ '-faddress-sanitizer', '-w', - '-mllvm', '-asan-blacklist=<(PRODUCT_DIR)/../../third_party/asan/ignore.txt', + '-mllvm', '-asan-blacklist=<(asan_blacklist)', ], 'OTHER_LDFLAGS': [ '-faddress-sanitizer',