diff options
| author | alextaran@chromium.org <alextaran@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-07 13:19:04 +0000 |
|---|---|---|
| committer | alextaran@chromium.org <alextaran@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-07 13:19:04 +0000 |
| commit | a5530fc448646a83af7446d9d22fccd35d939aa2 (patch) | |
| tree | 8e495e831561036981117ad228afa80e3531c0a8 /third_party | |
| parent | 8a3a1b56bea930b5d1d2a708a882fc9a8f84433e (diff) | |
| download | chromium_src-a5530fc448646a83af7446d9d22fccd35d939aa2.zip chromium_src-a5530fc448646a83af7446d9d22fccd35d939aa2.tar.gz chromium_src-a5530fc448646a83af7446d9d22fccd35d939aa2.tar.bz2 | |
Split instrumented libraries build lists for different instrumentation tools.
Some libraries can be built with asan, but not msan.
Also, we need different targets for every library and for every
instrumentation tool.
BUG=313751
R=glider@chromium.org
TBR=cpu@chromium.org
Review URL: https://codereview.chromium.org/98363005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 18 | ||||
| -rw-r--r-- | third_party/instrumented_libraries/standard_instrumented_library_target.gypi | 7 |
2 files changed, 16 insertions, 9 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index 02c77a421..3481239 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -27,9 +27,15 @@ 'prune_self_dependency': 1, }, 'dependencies': [ - 'libpng12-0', - 'libxau6', - 'libglib2.0-0', + '<(_sanitizer_type)-libpng12-0', + '<(_sanitizer_type)-libxau6', + ], + 'conditions': [ + ['asan==1', { + 'dependencies': [ + '<(_sanitizer_type)-libglib2.0-0', + ], + }], ], 'actions': [ { @@ -48,17 +54,17 @@ ], }, { - 'target_name': 'libpng12-0', + 'library_name': 'libpng12-0', 'dependencies=': [], 'includes': ['standard_instrumented_library_target.gypi'], }, { - 'target_name': 'libxau6', + 'library_name': 'libxau6', 'dependencies=': [], 'includes': ['standard_instrumented_library_target.gypi'], }, { - 'target_name': 'libglib2.0-0', + 'library_name': 'libglib2.0-0', 'dependencies=': [], 'includes': ['standard_instrumented_library_target.gypi'], }, diff --git a/third_party/instrumented_libraries/standard_instrumented_library_target.gypi b/third_party/instrumented_libraries/standard_instrumented_library_target.gypi index 838d957..cbf0759 100644 --- a/third_party/instrumented_libraries/standard_instrumented_library_target.gypi +++ b/third_party/instrumented_libraries/standard_instrumented_library_target.gypi @@ -6,19 +6,20 @@ # libraries and describes standard build action for most of the libraries. { + 'target_name': '<(_sanitizer_type)-<(_library_name)', 'type': 'none', 'actions': [ { - 'action_name': '<(_target_name)', + 'action_name': '<(_library_name)', 'inputs': [ 'download_build_install.py', ], 'outputs': [ - '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/<(_target_name).txt', + '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/<(_library_name).txt', ], 'action': ['<(DEPTH)/third_party/instrumented_libraries/download_build_install.py', '--product-directory=<(PRODUCT_DIR)', - '--library=<(_target_name)', + '--library=<(_library_name)', '--intermediate-directory=<(INTERMEDIATE_DIR)', '--sanitizer-type=<(_sanitizer_type)', '<(_verbose_libraries_build_flag)', |