| commit | d1fe352415daa951ba28e4ef81bfa6a727104f5e | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | Fri Apr 27 01:39:16 2012 +0000 |
| committer | [email protected] <[email protected]@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | Fri Apr 27 01:39:16 2012 +0000 |
| tree | f07d84ff84441591ced154e07ed4d80f3a710359 | |
| parent | bd7c9af0edad169859665a2b333a24795ff7b7bf [diff] |
enable libjpeg for chromium x86 android build Review URL: http://codereview.chromium.org/10234002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@134206 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/libjpeg.gyp b/libjpeg.gyp index 4248577..92a1d21 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp
@@ -233,7 +233,7 @@ ], }, }], - [ 'OS=="linux"', { + [ 'OS=="linux" or (OS=="android" and target_arch!="arm")', { 'conditions': [ [ 'use_system_yasm==0', { 'dependencies': [