diff options
| author | sammc <sammc@chromium.org> | 2015-05-31 18:09:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-01 01:10:10 +0000 |
| commit | 74f1d187956e64c25724b116ed06ca7d00b89917 (patch) | |
| tree | 06691d49eb471280c56b0a4d6bf8374954b957f1 /third_party/instrumented_libraries/instrumented_libraries.gyp | |
| parent | b45962be3b0ac2a4133290e4e02b4f9fdec012a6 (diff) | |
| download | chromium_src-74f1d187956e64c25724b116ed06ca7d00b89917.zip chromium_src-74f1d187956e64c25724b116ed06ca7d00b89917.tar.gz chromium_src-74f1d187956e64c25724b116ed06ca7d00b89917.tar.bz2 | |
GN: Add support for prebuilt instrumented libraries.
TBR=glider@chromium.org
Review URL: https://codereview.chromium.org/1150193002
Cr-Commit-Position: refs/heads/master@{#332148}
Diffstat (limited to 'third_party/instrumented_libraries/instrumented_libraries.gyp')
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index 8f0bdda..307aed1 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -94,34 +94,34 @@ ['msan==1', { 'conditions': [ ['msan_track_origins==2', { - 'archive_name': 'msan-chained-origins-<(_ubuntu_release)', + 'archive_prefix': 'msan-chained-origins', }, { 'conditions': [ ['msan_track_origins==0', { - 'archive_name': 'msan-no-origins-<(_ubuntu_release)', + 'archive_prefix': 'msan-no-origins', }, { - 'archive_name': 'UNSUPPORTED_CONFIGURATION' + 'archive_prefix': 'UNSUPPORTED_CONFIGURATION' }], ]}], ]}, { - 'archive_name': 'UNSUPPORTED_CONFIGURATION' + 'archive_prefix': 'UNSUPPORTED_CONFIGURATION' }], ], }, 'actions': [ { - 'action_name': 'unpack_<(archive_name).tgz', + 'action_name': 'unpack_<(archive_prefix)-<(_ubuntu_release).tgz', 'inputs': [ - 'binaries/<(archive_name).tgz', + 'binaries/<(archive_prefix)-<(_ubuntu_release).tgz', ], 'outputs': [ - '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/<(archive_name).txt', + '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/<(archive_prefix).txt', ], 'action': [ - 'scripts/unpack_binaries.sh', - 'binaries/<(archive_name).tgz', + 'scripts/unpack_binaries.py', + '<(archive_prefix)', + 'binaries', '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/', - '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/<(archive_name).txt', ], }, ], |