Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(518)

Unified Diff: gyp/utils.gyp

Issue 15060008: Re-land r9059 with empty cityhash.gyp, instead of deleted cityhash.gyp (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/cityhash.gyp ('k') | src/utils/SkBitmapHasher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/utils.gyp
===================================================================
--- gyp/utils.gyp (revision 9063)
+++ gyp/utils.gyp (working copy)
@@ -5,9 +5,6 @@
'product_name': 'skia_utils',
'type': 'static_library',
'standalone_static_library': 1,
- 'dependencies': [
- 'cityhash.gyp:cityhash',
- ],
'include_dirs': [
'../include/config',
'../include/core',
@@ -64,8 +61,6 @@
'../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',
@@ -195,16 +190,7 @@
],
'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': [
« no previous file with comments | « gyp/cityhash.gyp ('k') | src/utils/SkBitmapHasher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698