diff options
author | 2013-03-22 13:16:06 +0000 | |
---|---|---|
committer | 2013-03-22 13:16:06 +0000 | |
commit | a72aef8a21c095d7502385f965ad510c775a9377 (patch) | |
tree | c25a3a512a9a1c10fab91071a8730a9e7cdeb1cb /gyp/utils.gyp | |
parent | a3a09ab1d5e8ecc6f16b14610f9dd74be569cc29 (diff) |
Refactor skia_warnings_as_errors
Review URL: https://codereview.chromium.org/12963002
git-svn-id: http://skia.googlecode.com/svn/trunk@8330 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp/utils.gyp')
-rw-r--r-- | gyp/utils.gyp | 50 |
1 files changed, 2 insertions, 48 deletions
diff --git a/gyp/utils.gyp b/gyp/utils.gyp index f98e6fc9ce..00481112ee 100644 --- a/gyp/utils.gyp +++ b/gyp/utils.gyp @@ -6,7 +6,7 @@ 'type': 'static_library', 'standalone_static_library': 1, 'dependencies': [ - 'cityhash', + 'cityhash.gyp:cityhash', ], 'include_dirs': [ '../include/config', @@ -204,7 +204,7 @@ # missing byteswap.h which is needed by CityHash. # TODO(borenet): Find a way to either provide this dependency or # replace it. - 'cityhash', + 'cityhash.gyp:cityhash', ], }], [ 'skia_os == "android"', { @@ -219,52 +219,6 @@ ], }, }, - { - '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', - ], - }, - 'conditions': [ - [ 'skia_os == "mac"', { - 'xcode_settings': { - 'OTHER_CPLUSPLUSFLAGS!': [ - '-Werror', - ] - }, - }], - [ 'skia_os == "win"', { - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarnAsError': 'false', - }, - }, - }], - [ 'skia_os == "android"', { - 'cflags!': [ - '-Wall', - '-Werror', - ], - }], - ['skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { - 'cflags!': [ - '-Werror', - ], - }], - ], - }, ], } |