aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar Matt Sarett <msarett@google.com>2016-11-01 12:19:50 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-01 16:45:40 +0000
commita9e9bfc6e40894c0447c044a380c74061cb9e15e (patch)
treee8753d1cb647661e5212b4208aa704499985029d /gyp
parent10d665d000cfdce693b7ca088fb2c61ed54bcdfb (diff)
Delete qcms
This was always intended to be a temporary dependency to use for testing. It has served its purpose. Also, this has already been dropped (accidentally, I think) by the new GN build. TBR=reed@google.com BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4220 Change-Id: Ic72ee08bbfaf86ed86a4122fd38be2921eb1327e Reviewed-on: https://skia-review.googlesource.com/4220 Reviewed-by: Matt Sarett <msarett@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'gyp')
-rw-r--r--gyp/common_conditions.gypi6
-rw-r--r--gyp/ports.gyp4
-rw-r--r--gyp/qcms.gyp74
3 files changed, 0 insertions, 84 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index dd51277ecf..e3afd6767d 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -28,12 +28,6 @@
'SK_CODEC_DECODES_RAW',
],
}],
- [ 'skia_android_framework == 0', {
- 'defines': [
- # Temporarily test against the QCMS library.
- 'SK_TEST_QCMS',
- ],
- }],
['skia_pic', {
'cflags': [
'-fPIC',
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 388498317b..7bb403da57 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -76,10 +76,6 @@
['exclude', 'SkFontMgr_.+_factory\\.cpp$'],
],
'conditions': [
- [ 'skia_android_framework == 0', {
- 'dependencies': [ 'qcms.gyp:qcms', ],
- 'export_dependent_settings': [ 'qcms.gyp:qcms', ],
- }],
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
'sources': [
'../src/ports/SkFontHost_FreeType.cpp',
diff --git a/gyp/qcms.gyp b/gyp/qcms.gyp
deleted file mode 100644
index fc007b3eee..0000000000
--- a/gyp/qcms.gyp
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This build file has been adapted for use in Skia. The contents of third_party/qcms
-# are copied directly from Chromium.
-{
- 'variables': {
- 'skia_warnings_as_errors': 0,
- },
- 'targets': [
- {
- 'target_name': 'qcms',
- 'type': 'static_library',
-
- # Warning (sign-conversion) fixed upstream by large refactoring. Can be
- # removed on next roll.
- 'msvs_disabled_warnings': [ 4018 ],
-
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../third_party/qcms/src/',
- ],
- },
-
- 'sources': [
- '../third_party/qcms/src/chain.c',
- '../third_party/qcms/src/chain.h',
- '../third_party/qcms/src/iccread.c',
- '../third_party/qcms/src/matrix.c',
- '../third_party/qcms/src/matrix.h',
- '../third_party/qcms/src/qcms.h',
- '../third_party/qcms/src/qcmsint.h',
- '../third_party/qcms/src/qcmstypes.h',
- '../third_party/qcms/src/qcms_util.c',
- '../third_party/qcms/src/transform.c',
- '../third_party/qcms/src/transform_util.c',
- '../third_party/qcms/src/transform_util.h',
- ],
- 'conditions': [
- ['"x86" in skia_arch_type', {
- 'defines': [
- 'SSE2_ENABLE',
- ],
- 'sources': [
- '../third_party/qcms/src/transform-sse2.c',
- ],
- }],
- ['skia_os == "win"', {
- 'msvs_disabled_warnings': [
- 4056, # overflow in floating-point constant arithmetic (INFINITY)
- 4756, # overflow in constant arithmetic (INFINITY)
- ],
- }],
- ],
-
- # Disable warnings
- 'cflags': [
- '-w',
- ],
- 'xcode_settings': {
- 'WARNING_CFLAGS': [
- '-w'
- ],
- },
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- 'WarningLevel': '0',
- },
- },
-
- },
- ],
-}