diff options
| author | earthdok <earthdok@chromium.org> | 2015-03-27 09:46:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-27 16:47:32 +0000 |
| commit | cb2b870146a7b83bbf158c254683d164c931df59 (patch) | |
| tree | bb2c2f5ec9b82756f2a2b53dbf329b0da5a5c62f /third_party/instrumented_libraries/instrumented_libraries.gyp | |
| parent | 0a8d74709429f231ba5f4d554a650643884f007f (diff) | |
| download | chromium_src-cb2b870146a7b83bbf158c254683d164c931df59.zip chromium_src-cb2b870146a7b83bbf158c254683d164c931df59.tar.gz chromium_src-cb2b870146a7b83bbf158c254683d164c931df59.tar.bz2 | |
Instrumented libraries: merge chromeos=1 and chromeos=0 package lists.
Make the list of libraries which are built from source match the list of
pre-built libraries which are downloaded from GCS.
BUG=none
TBR=glider@chromium.org
Review URL: https://codereview.chromium.org/1039723002
Cr-Commit-Position: refs/heads/master@{#322592}
Diffstat (limited to 'third_party/instrumented_libraries/instrumented_libraries.gyp')
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index 4ac7e42..8f0bdda 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -197,6 +197,8 @@ '<(_sanitizer_type)-libunity9', '<(_sanitizer_type)-dee', '<(_sanitizer_type)-libpixman-1-0', + '<(_sanitizer_type)-brltty', + '<(_sanitizer_type)-libva1', ], 'conditions': [ ['"<(_ubuntu_release)"=="precise"', { @@ -221,12 +223,6 @@ '<(_sanitizer_type)-libpng12-0', ], }], - ['chromeos==1', { - 'dependencies': [ - '<(_sanitizer_type)-brltty', - '<(_sanitizer_type)-libva1', - ], - }] ], 'direct_dependent_settings': { 'target_conditions': [ |