diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-23 19:36:53 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-23 19:36:53 +0000 |
| commit | 41b46be215293d3704842ab1423bd87ff00b190c (patch) | |
| tree | be1f4bce99d61123dd4e80c3de3de05e51295e2a | |
| parent | a2ca41e3afdd8fad5e0e924dec029f33918e0a67 (diff) | |
Fix android build
git-svn-id: http://skia.googlecode.com/svn/trunk@3484 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/tools.gyp | 6 | ||||
| -rw-r--r-- | src/effects/SkEffects_none.cpp | 17 |
2 files changed, 3 insertions, 20 deletions
diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 6175eeeb02..349b0e068e 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -24,11 +24,11 @@ 'target_name': 'skdiff', 'type': 'executable', 'sources': [ - '../src/effects/SkEffects_none.cpp', '../tools/skdiff_main.cpp', ], 'dependencies': [ 'core.gyp:core', + 'effects.gyp:effects', 'images.gyp:images', 'ports.gyp:ports', 'utils.gyp:utils', @@ -38,11 +38,11 @@ 'target_name': 'skhello', 'type': 'executable', 'sources': [ - '../src/effects/SkEffects_none.cpp', '../tools/skhello.cpp', ], 'dependencies': [ 'core.gyp:core', + 'effects.gyp:effects', 'images.gyp:images', 'ports.gyp:ports', 'utils.gyp:utils', @@ -52,11 +52,11 @@ 'target_name': 'skimage', 'type': 'executable', 'sources': [ - '../src/effects/SkEffects_none.cpp', '../tools/skimage_main.cpp', ], 'dependencies': [ 'core.gyp:core', + 'effects.gyp:effects', 'images.gyp:images', 'ports.gyp:ports', 'utils.gyp:utils', diff --git a/src/effects/SkEffects_none.cpp b/src/effects/SkEffects_none.cpp deleted file mode 100644 index 519fcf708f..0000000000 --- a/src/effects/SkEffects_none.cpp +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2011 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "SkTypes.h" - -#if !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS - -#include "../../include/effects/SkEffects.h" - -void SkEffects::Init() { -} - -#endif |