Integrates libjpeg-turbo into Chromium (Chromium side)
This change is the Chromium-side change that integrates libjpeg-turbo into Chromium. (We need another change for WebKit.) It adds a GYP option 'libjpeg_turbo' so we can switch from libjpeg to libjpeg-turbo and use libjpeg-turbo when its value is 1. (Unfortunately, its value must be 0 for now to avoid build breaks until we land all changes required for libjpeg-turbo.) BUG=48789 TEST=build Chromium. Review URL: http://codereview.chromium.org/5292007 git-svn-id: http://src.chromium.org/svn/trunk/src/build@68453 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
896199e100
Коммит
36fa8b6f28
2
all.gyp
2
all.gyp
|
@ -33,7 +33,6 @@
|
|||
'../third_party/ffmpeg/ffmpeg.gyp:*',
|
||||
'../third_party/iccjpeg/iccjpeg.gyp:*',
|
||||
'../third_party/icu/icu.gyp:*',
|
||||
'../third_party/libjpeg/libjpeg.gyp:*',
|
||||
'../third_party/libpng/libpng.gyp:*',
|
||||
'../third_party/libwebp/libwebp.gyp:*',
|
||||
'../third_party/libxml/libxml.gyp:*',
|
||||
|
@ -51,6 +50,7 @@
|
|||
'../webkit/webkit.gyp:*',
|
||||
'util/build_util.gyp:*',
|
||||
'temp_gyp/googleurl.gyp:*',
|
||||
'<(libjpeg_gyp_path):*',
|
||||
],
|
||||
'conditions': [
|
||||
['javascript_engine=="v8"', {
|
||||
|
|
10
common.gypi
10
common.gypi
|
@ -140,6 +140,9 @@
|
|||
# Remoting compilation is enabled by default. Set to 0 to disable.
|
||||
'remoting%': 1,
|
||||
|
||||
# Use libjpeg-turbo as the JPEG codec used by Chromium.
|
||||
'use_libjpeg_turbo%': 0,
|
||||
|
||||
'library%': '<(library)',
|
||||
|
||||
# Variable 'component' is for cases where we would like to build some
|
||||
|
@ -400,6 +403,13 @@
|
|||
}, {
|
||||
'use_cups%': 0,
|
||||
}],
|
||||
# Set the relative path from this file to the GYP file of the JPEG
|
||||
# library used by Chromium.
|
||||
['use_libjpeg_turbo==1', {
|
||||
'libjpeg_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp',
|
||||
}, {
|
||||
'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp',
|
||||
}], # use_libjpeg_turbo==1
|
||||
],
|
||||
|
||||
# NOTE: When these end up in the Mac bundle, we need to replace '-' for '_'
|
||||
|
|
Загрузка…
Ссылка в новой задаче