diff options
| author | earthdok <earthdok@chromium.org> | 2014-10-01 10:43:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-01 17:44:07 +0000 |
| commit | da840b61c8e9c7f1c4e55ebb83eefeefb24c19d9 (patch) | |
| tree | 88964b84c46384b90f753fc5a617e4c2913d2fb0 /third_party/instrumented_libraries/instrumented_libraries.gyp | |
| parent | a040213b7020119ffe8f434ad948fe6adb37f1dc (diff) | |
| download | chromium_src-da840b61c8e9c7f1c4e55ebb83eefeefb24c19d9.zip chromium_src-da840b61c8e9c7f1c4e55ebb83eefeefb24c19d9.tar.gz chromium_src-da840b61c8e9c7f1c4e55ebb83eefeefb24c19d9.tar.bz2 | |
Instrumented libraries: introduce release-specific patches.
This CL enables applying different custom patches depending on the Ubuntu
release (Precise/Trusty). It also adds two Trusty-specific patches.
BUG=414189
R=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/614903003
Cr-Commit-Position: refs/heads/master@{#297672}
Diffstat (limited to 'third_party/instrumented_libraries/instrumented_libraries.gyp')
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index 406dbe9..f03767f 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -8,6 +8,8 @@ 'instrumented_libraries_jobs%': 1, }, + 'ubuntu_release': '<!(lsb_release -cs)', + 'conditions': [ ['asan==1', { 'sanitizer_type': 'asan', @@ -220,7 +222,13 @@ # From debian/rules. '--with-add-fonts=/usr/X11R6/lib/X11/fonts,/usr/local/share/fonts', ], - 'patch': 'patches/libfontconfig.diff', + 'conditions': [ + ['"<(_ubuntu_release)"=="precise"', { + 'patch': 'patches/libfontconfig.precise.diff', + }, { + 'patch': 'patches/libfontconfig.trusty.diff', + }], + ], 'includes': ['standard_instrumented_package_target.gypi'], }, { @@ -506,7 +514,13 @@ '--with-xinput=yes', ], 'dependencies=': [], - 'patch': 'patches/libgtk2.0-0.diff', + 'conditions': [ + ['"<(_ubuntu_release)"=="precise"', { + 'patch': 'patches/libgtk2.0-0.precise.diff', + }, { + 'patch': 'patches/libgtk2.0-0.trusty.diff', + }], + ], 'run_before_build': 'scripts/libgtk2.0-0.sh', 'includes': ['standard_instrumented_package_target.gypi'], }, |