Add a variable for the libjpeg include directory.

- Also clean up the use of libjpeg_gyp_path. Both the Chromium and
  standalone builds can use it.

BUG=none
TEST=build with all combinations of use_libjpeg_turbo and build_libjpeg

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2389 4adac7df-926f-26a2-2b94-8c16560cd09d

src/common_video/jpeg/jpeg.gypi

@@ -9,6 +9,13 @@
 {
   'variables': {
     'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
+    'conditions': [
+      ['use_libjpeg_turbo==1', {
+        'libjpeg_include_dir%': [ '<(DEPTH)/third_party/libjpeg_turbo', ],
+      }, {
+        'libjpeg_include_dir%': [ '<(DEPTH)/third_party/libjpeg', ],
+      }],
+    ],
   },
   'targets': [
     {
@@ -30,38 +37,12 @@
       },
       'conditions': [
         ['build_libjpeg==1', {
-          'conditions': [
-            ['build_with_chromium==1', {
-              'dependencies': [
-                '<(libjpeg_gyp_path):libjpeg',
-              ],
-            }, {
-              'conditions': [
-                ['use_libjpeg_turbo==1', {
-                  'dependencies': [
-                    '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
-                  ],
-                }, {
-                  'dependencies': [
-                    '<(DEPTH)/third_party/libjpeg/libjpeg.gyp:libjpeg',
-                  ],
-                }],
-              ],
-            }],
+          'dependencies': [
+            '<(libjpeg_gyp_path):libjpeg',
           ],
         }, {
           # Need to add a directory normally exported by libjpeg.gyp.
-          'conditions': [
-            ['use_libjpeg_turbo==1', {
-              'include_dirs': [
-                '<(DEPTH)/third_party/libjpeg_turbo',
-              ],
-            }, {
-              'include_dirs': [
-                '<(DEPTH)/third_party/libjpeg',
-              ],
-            }],
-          ],
+          'include_dirs': [ '<(libjpeg_include_dir)' ],
         }],
       ],
       'sources': [