diff options
| author | earthdok <earthdok@chromium.org> | 2015-03-24 13:12:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-24 20:13:22 +0000 |
| commit | 28db7a9e72a3b02f46f4cd8b664b10ff871b647a (patch) | |
| tree | a4c2e464d39cf19c21d0c926443eccb429f18c9b | |
| parent | 3a9a6b48f8adae8b41c37903797f8804f797f59d (diff) | |
| download | chromium_src-28db7a9e72a3b02f46f4cd8b664b10ff871b647a.zip chromium_src-28db7a9e72a3b02f46f4cd8b664b10ff871b647a.tar.gz chromium_src-28db7a9e72a3b02f46f4cd8b664b10ff871b647a.tar.bz2 | |
Instrumented libraries: add pre-built libs for msan-no-origins.
BUG=462636
TBR=glider@chromium.org
Review URL: https://codereview.chromium.org/1028383003
Cr-Commit-Position: refs/heads/master@{#322060}
4 files changed, 11 insertions, 2 deletions
diff --git a/third_party/instrumented_libraries/binaries/msan-no-origins-precise.tgz.sha1 b/third_party/instrumented_libraries/binaries/msan-no-origins-precise.tgz.sha1 new file mode 100644 index 0000000..9f17c0d --- /dev/null +++ b/third_party/instrumented_libraries/binaries/msan-no-origins-precise.tgz.sha1 @@ -0,0 +1 @@ +2a66a901c3b0acd3e5c5cbf49ddfa442f77bb38e
\ No newline at end of file diff --git a/third_party/instrumented_libraries/binaries/msan-no-origins-trusty.tgz.sha1 b/third_party/instrumented_libraries/binaries/msan-no-origins-trusty.tgz.sha1 new file mode 100644 index 0000000..bbe6657 --- /dev/null +++ b/third_party/instrumented_libraries/binaries/msan-no-origins-trusty.tgz.sha1 @@ -0,0 +1 @@ +098097aa3f25d94b73014c9249a41bfe37f3242b
\ No newline at end of file diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index 2d61a3b..050ed09 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -94,8 +94,13 @@ ['msan_track_origins==2', { 'archive_name': 'msan-chained-origins-<(_ubuntu_release)', }, { - 'archive_name': 'UNSUPPORTED_CONFIGURATION' - }], + 'conditions': [ + ['msan_track_origins==0', { + 'archive_name': 'msan-no-origins-<(_ubuntu_release)', + }, { + 'archive_name': 'UNSUPPORTED_CONFIGURATION' + }], + ]}], ]}, { 'archive_name': 'UNSUPPORTED_CONFIGURATION' }], diff --git a/third_party/instrumented_libraries/scripts/download_binaries.py b/third_party/instrumented_libraries/scripts/download_binaries.py index 62ef9fc..83ec7b6 100755 --- a/third_party/instrumented_libraries/scripts/download_binaries.py +++ b/third_party/instrumented_libraries/scripts/download_binaries.py @@ -20,6 +20,8 @@ def get_ubuntu_release(): def get_configuration(gyp_defines): if re.search(r'\b(msan)=1', gyp_defines): + if 'msan_track_origins=0' in gyp_defines: + return 'msan-no-origins' if 'msan_track_origins=2' in gyp_defines: return 'msan-chained-origins' if 'msan_track_origins=' not in gyp_defines: |