Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: third_party/instrumented_libraries/instrumented_libraries.gyp

Issue 614903003: Instrumented libraries: introduce release-specific patches. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/instrumented_libraries/patches/libfontconfig.diff » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/instrumented_libraries/instrumented_libraries.gyp
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index 406dbe9ef408ae4a78e3b2ce07e48cdf56b9e9f1..f03767f7397fe7292a5224ad6cbad34ef6cb7737 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'],
},
« no previous file with comments | « no previous file | third_party/instrumented_libraries/patches/libfontconfig.diff » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698