| Index: build/common.gypi
|
| ===================================================================
|
| --- build/common.gypi (revision 180386)
|
| +++ build/common.gypi (working copy)
|
| @@ -26,12 +26,15 @@
|
|
|
| # Whether or not we are building the Ash shell.
|
| 'use_ash%': 0,
|
| + 'asan_sentinel%': 0,
|
| },
|
| # Copy conditionally-set variables out one scope.
|
| 'chromeos%': '<(chromeos)',
|
| 'use_aura%': '<(use_aura)',
|
| 'use_ash%': '<(use_ash)',
|
|
|
| + 'asan_sentinel%': '<(asan_sentinel)',
|
| +
|
| # Whether we are using Views Toolkit
|
| 'toolkit_views%': 0,
|
|
|
| @@ -97,6 +100,7 @@
|
| 'enable_touch_ui%': '<(enable_touch_ui)',
|
| 'buildtype%': '<(buildtype)',
|
| 'host_arch%': '<(host_arch)',
|
| + 'asan_sentinel%': '<(asan_sentinel)',
|
|
|
| # Default architecture we're building for is the architecture we're
|
| # building on.
|
| @@ -662,6 +666,7 @@
|
| 'google_api_key%': '',
|
| 'google_default_client_id%': '',
|
| 'google_default_client_secret%': '',
|
| + 'asan_sentinel%': '<(asan_sentinel)',
|
| },
|
|
|
| # Copy conditionally-set variables out one scope.
|
| @@ -755,6 +760,7 @@
|
| 'google_default_client_id%': '<(google_default_client_id)',
|
| 'google_default_client_secret%': '<(google_default_client_secret)',
|
| 'enable_managed_users%': '<(enable_managed_users)',
|
| + 'asan_sentinel%': '<(asan_sentinel)',
|
|
|
| # Use system mesa instead of bundled one.
|
| 'use_system_mesa%': 0,
|
| @@ -1621,6 +1627,7 @@
|
| ],
|
|
|
| 'conditions': [
|
| +
|
| ['OS=="win" and component=="shared_library"', {
|
| # See http://msdn.microsoft.com/en-us/library/aa652367.aspx
|
| 'win_release_RuntimeLibrary%': '2', # 2 = /MD (nondebug DLL)
|
| @@ -1642,6 +1649,11 @@
|
| ],
|
| },
|
| 'conditions': [
|
| + ['1==1 and asan_sentinel==0', {
|
| + 'dependencies': [
|
| + '<(DEPTH)/build/asan.gyp:asan_dynamic_runtime',
|
| + ],
|
| + }],
|
| ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', {
|
| 'cflags_cc!': ['-fno-rtti'],
|
| 'cflags_cc+': [
|
| @@ -2400,6 +2412,7 @@
|
| },
|
| },
|
| 'conditions': [
|
| +
|
| ['os_posix==1', {
|
| 'target_defaults': {
|
| 'ldflags': [
|
| @@ -4039,4 +4052,5 @@
|
| # and therefore SYMROOT, needs to be set at the project level.
|
| 'SYMROOT': '<(DEPTH)/xcodebuild',
|
| },
|
| +
|
| }
|
|
|