From 31ca87408e6f4c3ec2e1a6b6a2867921f38923ce Mon Sep 17 00:00:00 2001
From: "fbarchard@google.com"
 <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Fri, 13 Dec 2013 00:25:28 +0000
Subject: [PATCH] Include libjpeg unconditionally

libjpeg/libjpeg.gyp should be used in both local and system libjpeg,
otherwise, header file won't found when build with system libjpeg. see
the comments in third_party/libjpeg/libjpeg.gyp

BUG=chromium:316499
R=michaelbai@chromium.org

Review URL: https://webrtc-codereview.appspot.com/5709004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@912 16f28f9a-4ce2-e073-06de-1de4eb20be90
---
 DEPS                     |  3 +++
 README.chromium          |  2 +-
 include/libyuv/version.h |  2 +-
 libyuv.gyp               | 12 +++++++++---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/DEPS b/DEPS
index 7e866873c..e797422e5 100644
--- a/DEPS
+++ b/DEPS
@@ -81,6 +81,9 @@ deps_os = {
   "android": {
     "third_party/android_tools":
       From("chromium_deps", "src/third_party/android_tools"),
+
+    "third_party/libjpeg":
+      From("chromium_deps", "src/third_party/libjpeg"),
   },
   "ios": {
     # NSS, for SSLClientSocketNSS.
diff --git a/README.chromium b/README.chromium
index f11363cc4..46e39b2c6 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 911
+Version: 912
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 3bb834f94..504b95815 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 911
+#define LIBYUV_VERSION 912
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/libyuv.gyp b/libyuv.gyp
index 4130bd0d3..3ce979278 100644
--- a/libyuv.gyp
+++ b/libyuv.gyp
@@ -24,16 +24,22 @@
             'HAVE_JPEG'
           ],
           'conditions': [
-            [ 'use_system_libjpeg==0', {
+            # Android uses libjpeg for system jpeg support.
+            [ 'OS == "android" and use_system_libjpeg == 1', {
+              'dependencies': [
+                 '<(DEPTH)/third_party/libjpeg/libjpeg.gyp:libjpeg',
+              ],
+            }, {
               'dependencies': [
                  '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
               ],
-            }, {
+            }],
+            [ 'use_system_libjpeg == 1', {
               'link_settings': {
                 'libraries': [
                   '-ljpeg',
                 ],
-              },
+              }
             }],
           ],
         }],