Fix Android framework build

gyp/codec.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # GYP file for codec project.
 {
   'targets': [
     {
       'target_name': 'codec',
       'product_name': 'skia_codec',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
         'giflib.gyp:giflib',
-        'libjpeg-turbo.gyp:libjpeg-turbo',
         'libwebp.gyp:libwebp',
       ],
-      'export_dependent_settings': [
-        'libjpeg-turbo.gyp:libjpeg-turbo',
-      ],
       'cflags':[
         # FIXME: This gets around a longjmp warning. See
         # http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Release-Trybot/builds/113/steps/build%20most/logs/stdio
         '-Wno-clobbered',
       ],
       'include_dirs': [
         '../include/codec',
         '../src/codec',
         '../src/core',
       ],
@@ skipping 19 matching lines @@
         ],
       },
       'conditions': [
         [ 'skia_android_framework == 1',
           {
             # TODO(djsollen): this is a temporary dependency until we can update
             # the android framework to a more recent version of libpng.
             'dependencies': [
               'libpng.gyp:libpng',
             ],
-            # TODO(msarett): update libjpeg-turbo on Android so we can compile SkJpegCodec
+            # TODO(msarett): Add libjpeg-turbo to Android so we can compile SkJpegCodec
             # for the framework.
             'sources!': [
               '../src/codec/SkJpegCodec.cpp',
               '../src/codec/SkJpegDecoderMgr.cpp',
               '../src/codec/SkJpegUtility_codec.cpp',
             ],
-            'dependencies!': [
-              'libjpeg-turbo.gyp:libjpeg-turbo',
-            ],
           }, {  # !skia_android_framework
             'dependencies': [
+              # TODO(msarett): Add libjpeg-turbo to Android so this can be a global
+              # dependency.
+              'libjpeg-turbo.gyp:libjpeg-turbo',
               'libpng.gyp:libpng_static',
             ],
+            'export_dependent_settings': [
+              'libjpeg-turbo.gyp:libjpeg-turbo',
+            ],
             'cflags': [
               '-DTURBO_HAS_SKIP',
             ],
           }
         ]
       ]
     },
   ],
 }