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

Unified Diff: build/common.gypi

Issue 10886050: Add code to insure we are using the correct library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed DEPS Created 8 years, 4 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 | ui/gfx/codec/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 8be3bd70d2adc913f8b6cec5bdfb1f87a8eed900..a146b9042c75df63b5649b00fa91ba885db7808f 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -610,6 +610,7 @@
'sas_dll_path%': '<(sas_dll_path)',
'wix_path%': '<(wix_path)',
'android_upstream_bringup%': '<(android_upstream_bringup)',
+ 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
'use_system_libjpeg%': '<(use_system_libjpeg)',
'android_build_type%': '<(android_build_type)',
@@ -1398,6 +1399,9 @@
['use_ash==1', {
'defines': ['USE_ASH=1'],
}],
+ ['use_libjpeg_turbo==1', {
+ 'defines': ['USE_LIBJPEG_TURBO=1'],
+ }],
['use_nss==1', {
'defines': ['USE_NSS=1'],
}],
« no previous file with comments | « no previous file | ui/gfx/codec/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698