Fix gyp files so that gyp_to_Android.mk succeeds

gyp/dng_sdk.gyp

 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # The Adobe DNG SDK, an API for reading and writing DNG files.
 {
 'targets': [{
   'target_name': 'dng_sdk-selector',
   'type': 'none',
   'conditions': [
     [ 'skia_android_framework', {
-        'dependencies': [ 'android_deps.gyp:dng_sdk' ],
-        'export_dependent_settings': [ 'android_deps.gyp:dng_sdk' ],
+        'dependencies': [ 'android_deps.gyp:libdng_sdk' ],

[msarett, 2016/01/25 19:24:39]

Targets cannot have the same name.

+        'export_dependent_settings': [ 'android_deps.gyp:libdng_sdk' ],
       }, {
-        'dependencies': [ 'dng_sdk' ],
-        'export_dependent_settings': [ 'dng_sdk' ],
+        'dependencies': [ 'dng_sdk.gyp:dng_sdk' ],
+        'export_dependent_settings': [ 'dng_sdk.gyp:dng_sdk' ],
     }]
   ]
 },{
   'target_name': 'dng_sdk',
   'type': 'static_library',
   'cflags_cc': [ '-fexceptions' ],
   'cflags': [
     '-fexceptions',
     '-w',
     # FIXME: only disable ::posix_memalign() when needed.
@@ skipping 97 matching lines @@
       '../third_party/externals/dng_sdk/source/dng_types.h',
       '../third_party/externals/dng_sdk/source/dng_uncopyable.h',
       '../third_party/externals/dng_sdk/source/dng_utils.h',
       '../third_party/externals/dng_sdk/source/dng_xy_coord.h',
       '../third_party/externals/dng_sdk/source/dng_jpeg_memory_source.h',
       '../third_party/externals/dng_sdk/source/dng_jpeglib.h',
       '../third_party/externals/dng_sdk/source/dng_safe_arithmetic.h',
     ],
   },
   'dependencies': [
-    'libjpeg-turbo.gyp:libjpeg-turbo',
+    'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
     'zlib.gyp:zlib',
   ],
   'export_dependent_settings': [
-    'libjpeg-turbo.gyp:libjpeg-turbo',
+    'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',

[msarett, 2016/01/25 19:24:39]

Need to include the selector.

[scroggo, 2016/01/26 13:28:58]

I'm surprised - I thought this was okay because this is only used when
!skia_build_for_android_framework, so it made sense to me that we could pick the
one that is used under that condition.

[msarett, 2016/01/26 14:30:41]

Yeah this *should* be ok.

AFAICT, the issue is that (if we don't include the extra indirection),
gyp_to_android.py will attempt to parse libjpeg-turbo.gyp and will fail when
"host_os" is not defined.

     'zlib.gyp:zlib',
   ],
   'direct_dependent_settings': {
     'sources': [
       '../third_party/externals/dng_sdk/source/dng_1d_function.cpp',
       '../third_party/externals/dng_sdk/source/dng_1d_table.cpp',
       '../third_party/externals/dng_sdk/source/dng_abort_sniffer.cpp',
       '../third_party/externals/dng_sdk/source/dng_area_task.cpp',
       '../third_party/externals/dng_sdk/source/dng_bad_pixels.cpp',
       '../third_party/externals/dng_sdk/source/dng_bottlenecks.cpp',
@@ skipping 124 matching lines @@
     ],
   },
 }, {
   'target_name': 'dng_frame_larger_than_flags',
   'type': 'none',
   'direct_dependent_settings': {
     'cflags': ['-Wframe-larger-than=20000'],
   },
 }],
 }