diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 13:36:12 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 13:36:12 +0000 |
| commit | adb44341dafc75d02f68f01fb0c092605e7557d6 (patch) | |
| tree | 473c9531a4a17a01bc6b9bb93187013350ca4be5 /third_party/libjpeg/libjpeg.gyp | |
| parent | b019ec4224fa1358cc97b737cd3e40125ea39fa9 (diff) | |
| download | chromium_src-adb44341dafc75d02f68f01fb0c092605e7557d6.zip chromium_src-adb44341dafc75d02f68f01fb0c092605e7557d6.tar.gz chromium_src-adb44341dafc75d02f68f01fb0c092605e7557d6.tar.bz2 | |
Hook up use_system_libjpeg for Android
Also enable it by default when builing with the Android build system.
Review URL: https://chromiumcodereview.appspot.com/10807019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjpeg/libjpeg.gyp')
| -rw-r--r-- | third_party/libjpeg/libjpeg.gyp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp index 8f0dac8..f8ce278 100644 --- a/third_party/libjpeg/libjpeg.gyp +++ b/third_party/libjpeg/libjpeg.gyp @@ -92,6 +92,11 @@ '/usr/local/include', ], }], + ['OS=="android"', { + 'include_dirs': [ + '<(android_src)/external/jpeg', + ], + }], ], }, 'link_settings': { |