Replace SkConsistentChecksum with SkCityHash (now including CityHash via DEPS)
Alternative to https://codereview.appspot.com/6847087/ ('Change SkConsistentChecksum to use SuperFastHash')
Review URL: https://codereview.appspot.com/6867060
git-svn-id: http://skia.googlecode.com/svn/trunk@6701 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 5658f04..b2833f2 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -5,6 +5,9 @@
'product_name': 'skia_utils',
'type': 'static_library',
'standalone_static_library': 1,
+ 'dependencies': [
+ 'cityhash',
+ ],
'include_dirs': [
'../include/config',
'../include/core',
@@ -23,6 +26,7 @@
'../include/utils/SkCountdown.h',
'../include/utils/SkRunnable.h',
'../include/utils/SkThreadPool.h',
+ '../src/utils/SkCityHash.cpp',
'../src/utils/SkCondVar.cpp',
'../src/utils/SkCountdown.cpp',
'../src/utils/SkThreadPool.cpp',
@@ -193,6 +197,25 @@
],
},
},
+ {
+ 'target_name': 'cityhash',
+ 'type': 'static_library',
+ 'standalone_static_library': 1,
+ 'include_dirs': [
+ '../include/config',
+ '../include/core',
+ '../src/utils/cityhash',
+ '../third_party/externals/cityhash/src',
+ ],
+ 'sources': [
+ '../third_party/externals/cityhash/src/city.cc',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '../third_party/externals/cityhash/src',
+ ],
+ },
+ },
],
}