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

Unified Diff: build/common.gypi

Issue 5292007: Integrates libjpeg-turbo into Chromium (Chromium side)... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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
« app/app.gyp ('K') | « build/all.gyp ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 67654)
+++ build/common.gypi (working copy)
@@ -140,6 +140,11 @@
# Remoting compilation is enabled by default. Set to 0 to disable.
'remoting%': 1,
+ # The relative path from 'src/third_party' to the GYP file of the JPEG
Mark Mentovai 2010/11/30 15:06:01 This doesn’t need to be relative to src/third_part
Hironori Bono 2010/12/03 09:32:16 Done. Thank you for noticing it. (Such comments ar
+ # library used by Chromium. To use libjpeg-turbo instead of libjpeg, we
+ # need to change this variable to 'libjpeg_turbo/libjpeg.gyp'.
+ 'libjpeg_gyp_path%': 'libjpeg/libjpeg.gyp',
+
'library%': '<(library)',
# Variable 'component' is for cases where we would like to build some
@@ -169,6 +174,7 @@
'sysroot%': '<(sysroot)',
'disable_sse2%': '<(disable_sse2)',
'remoting%': '<(remoting)',
+ 'libjpeg_gyp_path%': '<(libjpeg_gyp_path)',
Mark Mentovai 2010/11/30 15:06:01 It still might be a good idea to have a condition
Hironori Bono 2010/12/03 09:32:16 Done. I have added a 'use_libjpeg_turbo' variable
'library%': '<(library)',
'component%': '<(component)',
« app/app.gyp ('K') | « build/all.gyp ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698