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

Unified Diff: build/linux/unbundle/libjpeg.gyp

Issue 14203006: Extract use_system_foo logic out of gyp files, patch 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
Index: build/linux/unbundle/libjpeg.gyp
diff --git a/build/linux/unbundle/harfbuzz.gyp b/build/linux/unbundle/libjpeg.gyp
similarity index 51%
copy from build/linux/unbundle/harfbuzz.gyp
copy to build/linux/unbundle/libjpeg.gyp
index 456dd384df2d5c57d9857cfb775d46ef87add2bc..f56e7aa614109c70ec8cc009e91e4876b3eadc70 100644
--- a/build/linux/unbundle/harfbuzz.gyp
+++ b/build/linux/unbundle/libjpeg.gyp
@@ -5,24 +5,25 @@
{
'targets': [
{
- 'target_name': 'harfbuzz-ng',
+ 'target_name': 'libjpeg',
'type': 'none',
- 'cflags': [
- '<!@(pkg-config --cflags harfbuzz)',
- ],
'direct_dependent_settings': {
- 'cflags': [
- '<!@(pkg-config --cflags harfbuzz)',
+ 'defines': [
+ 'USE_SYSTEM_LIBJPEG',
+ ],
+ 'conditions': [
+ ['os_bsd==1', {
+ 'include_dirs': [
+ '/usr/local/include',
+ ],
+ }],
],
},
'link_settings': {
- 'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other harfbuzz)',
- ],
'libraries': [
- '<!@(pkg-config --libs-only-l harfbuzz)',
+ '-ljpeg',
],
},
- },
+ }
],
}

Powered by Google App Engine
This is Rietveld 408576698