Remove some files from views.gyp that already being compiled into utils.gyp

(already done for Linux, this change does the same for Mac and Win).

Review URL:  http://codereview.appspot.com/4575044/

git-svn-id: http://skia.googlecode.com/svn/trunk@1654 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gyp/core.gyp b/gyp/core.gyp
index b5bc962..ba63485 100644 (file)
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -289,9 +289,6 @@
 
             '../src/ports/SkThread_pthread.cpp',
             '../src/ports/SkTime_Unix.cpp',
-
-            # TODO(epoger): why are we building this here?
-            '../src/utils/mac/SkCreateCGImageRef.cpp',
           ],
           'link_settings': {
             'libraries': [

diff --git a/gyp/images.gyp b/gyp/images.gyp
index e052f1e..ba05a07 100644 (file)
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -97,9 +97,6 @@
           # our code that calls it.
           # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings
           'link_settings': {
-            'sources': [
-              '../src/images/SkImageDecoder_libpng.cpp',
-            ],
             'libraries': [
               '-lpng',
             ],

diff --git a/gyp/views.gyp b/gyp/views.gyp
index 02059a4..6ba42bf 100644 (file)
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -73,25 +73,7 @@
         '../src/views/SkListWidget.cpp', #depends on missing SkListSource implementation
       ],
       'conditions': [
-        [ 'OS == "win"', {
-          'sources': [
-            '../src/utils/win/SkOSWindow_Win.cpp',
-            '../src/utils/win/skia_win.cpp',
-          ],
-        }],
         [ 'OS == "mac"', {
-          # TODO(epoger): why are we building these here instead of inheriting
-          # them from utils.gyp?
-          'sources': [
-            '../include/utils/SkCGUtils.h',
-            '../src/utils/mac/SkCreateCGImageRef.cpp',
-            '../src/utils/mac/SkEGLContext_mac.cpp',
-            '../src/utils/mac/skia_mac.cpp',
-            '../src/utils/mac/SkOSWindow_Mac.cpp',
-          ],
-          'include_dirs': [
-            '../include/utils/mac',
-          ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',