Revert of Move uils and sksl to a common sources GYP file.

gyp/utils.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.
 # Gyp for utils.
 {
-  'variables': {
-    'includes': [ 'skia_sources.gypi' ],
-  },
   'targets': [
     {
       'target_name': 'utils',
       'product_name': 'skia_utils',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
         'etc1.gyp:libetc1',
       ],
+      'includes': [
+        'utils.gypi',
+      ],
       'include_dirs': [
         '../include/effects',
         '../include/gpu',
         '../include/images',
         '../include/pathops',
         '../include/private',
         '../include/utils',
         '../include/utils/mac',
         '../src/core',
         '../src/gpu',
         '../src/image',
         '../src/opts',
         '../src/utils',
         '../src/utils/win',
       ],
       'sources': [
-        '<@(utils_sources)',  # Makes the sources appear in IDEs (but does not modify the build).
+        'utils.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
       ],
       'conditions': [
         [ 'skia_os == "mac"', {
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AGL.framework',
             ],
           },
         }],
         [ 'skia_os in ["mac", "ios"]', {
@@ skipping 45 matching lines @@
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include/utils',
           '../src/utils',
         ],
       },
     },
   ],
 }