Fix Android framework build

gyp/codec.gyp

Index: gyp/codec.gyp
diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index c008590dad4c859d1d57ecb9e72f8088e2c2e9b7..041d7d1232d047e82efa00a99d83b4bdeaab825a 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -18,12 +18,8 @@
       '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
@@ -63,20 +59,23 @@
             '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',
             ],