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

@@ -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.

README.chromium

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 911
+Version: 912
 License: BSD
 License File: LICENSE
 

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

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_turbo/libjpeg.gyp:libjpeg',
+                 '<(DEPTH)/third_party/libjpeg/libjpeg.gyp:libjpeg',
               ],
             }, {
+              'dependencies': [
+                 '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
+              ],
+            }],
+            [ 'use_system_libjpeg == 1', {
               'link_settings': {
                 'libraries': [
                   '-ljpeg',
                 ],
-              },
+              }
             }],
           ],
         }],