Re-land r9059 with empty cityhash.gyp, instead of deleted cityhash.gyp

gyp/utils.gyp

 {
   'targets': [
     {
       'target_name': 'utils',
       'product_name': 'skia_utils',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'cityhash.gyp:cityhash',
-      ],
       'include_dirs': [
         '../include/config',
         '../include/core',
         '../include/effects',
         '../include/images',
         '../include/pipe',
         '../include/utils',
         '../include/utils/mac',
         '../include/utils/unix',
         '../include/utils/win',
@@ skipping 36 matching lines @@
         '../include/utils/SkWGL.h',
 
         '../src/utils/SkBase64.cpp',
         '../src/utils/SkBase64.h',
         '../src/utils/SkBitmapHasher.cpp',
         '../src/utils/SkBitmapHasher.h',
         '../src/utils/SkBitSet.cpp',
         '../src/utils/SkBitSet.h',
         '../src/utils/SkBoundaryPatch.cpp',
         '../src/utils/SkCamera.cpp',
-        '../src/utils/SkCityHash.cpp',
-        '../src/utils/SkCityHash.h',
         '../src/utils/SkCubicInterval.cpp',
         '../src/utils/SkCullPoints.cpp',
         '../src/utils/SkDeferredCanvas.cpp',
         '../src/utils/SkDumpCanvas.cpp',
         '../src/utils/SkFloatUtils.h',
         '../src/utils/SkInterpolator.cpp',
         '../src/utils/SkLayer.cpp',
         '../src/utils/SkMatrix44.cpp',
         '../src/utils/SkMD5.cpp',
         '../src/utils/SkMD5.h',
@@ skipping 109 matching lines @@
             '../src/utils/win/SkHRESULT.cpp',
             '../src/utils/win/SkIStream.cpp',
           ],
         }],
         [ 'skia_os == "nacl"', {
           'sources': [
             '../src/utils/SkThreadUtils_pthread_other.cpp',
           ],
           'sources!': [
             '../src/utils/SkThreadUtils_pthread_linux.cpp',
-            '../src/utils/SkCityHash.cpp',
-            '../src/utils/SkCityHash.h',
-          ],
-          'dependencies!': [
-            # CityHash is not supported on NaCl because the NaCl toolchain is
-            # missing byteswap.h which is needed by CityHash.
-            # TODO(borenet): Find a way to either provide this dependency or
-            # replace it.
-            'cityhash.gyp:cityhash',
           ],
         }],
         [ 'skia_os == "android"', {
           'sources': [
             '../src/utils/android/ashmem.cpp',
           ],
         }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include/utils',
         ],
       },
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: