Revert 71982 - [Committed on behalf of reed@google.com]...

skia/skia.gyp

 # Copyright (c) 2010 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.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(library)',
       'msvs_guid': 'CD9CA56E-4E94-444C-87D4-58CA1E6F300D',
       'sources': [
-        '../third_party/skia/gpu/src/GrAllocPool.cpp',
-        '../third_party/skia/gpu/src/GrAtlas.cpp',
-        '../third_party/skia/gpu/src/GrClip.cpp',
-        '../third_party/skia/gpu/src/GrContext.cpp',
-        '../third_party/skia/gpu/src/GrDrawTarget.cpp',
-        '../third_party/skia/gpu/src/GrGLIndexBuffer.cpp',
-        '../third_party/skia/gpu/src/GrGLTexture.cpp',
-        '../third_party/skia/gpu/src/GrGLUtil.cpp',
-        '../third_party/skia/gpu/src/GrGLVertexBuffer.cpp',
-        '../third_party/skia/gpu/src/GrGpu.cpp',
-        '../third_party/skia/gpu/src/GrGpuGLShaders.cpp',
-        '../third_party/skia/gpu/src/GrGpuGLShaders.h',
-        '../third_party/skia/gpu/src/GrGpuFactory.cpp',
-        '../third_party/skia/gpu/src/GrGpuGL.cpp',
-        '../third_party/skia/gpu/src/GrGpuGL.h',
-        '../third_party/skia/gpu/src/GrInOrderDrawBuffer.cpp',
-        '../third_party/skia/gpu/src/GrMatrix.cpp',
-        '../third_party/skia/gpu/src/GrMemory.cpp',
-        '../third_party/skia/gpu/src/GrPath.cpp',
-        '../third_party/skia/gpu/src/GrRectanizer_fifo.cpp',
-        '../third_party/skia/gpu/src/GrTextureCache.cpp',
-        '../third_party/skia/gpu/src/GrTextContext.cpp',
-        '../third_party/skia/gpu/src/GrTextStrike.cpp',
-        '../third_party/skia/gpu/src/GrTextStrike_impl.h',
-        '../third_party/skia/gpu/src/GrVertexBufferAllocPool.cpp',
-
-        '../third_party/skia/gpu/include/GrAllocPool.h',
-        '../third_party/skia/gpu/include/GrAllocator.h',
-        '../third_party/skia/gpu/include/GrAtlas.h',
-        '../third_party/skia/gpu/include/GrClip.h',
-        '../third_party/skia/gpu/include/GrClipIterator.h',
-        '../third_party/skia/gpu/include/GrColor.h',
-        '../third_party/skia/gpu/include/GrConfig.h',
-        '../third_party/skia/gpu/include/GrContext.h',
-        '../third_party/skia/gpu/include/GrDrawTarget.h',
-        '../third_party/skia/gpu/include/GrFontScaler.h',
-        '../third_party/skia/gpu/include/GrGLConfig.h',
-        '../third_party/skia/gpu/include/GrGLIndexBuffer.h',
-        '../third_party/skia/gpu/include/GrGLTexture.h',
-        '../third_party/skia/gpu/include/GrGLVertexBuffer.h',
-        '../third_party/skia/gpu/include/GrGlyph.h',
-        '../third_party/skia/gpu/include/GrGpu.h',
-        '../third_party/skia/gpu/include/GrGpuVertex.h',
-        '../third_party/skia/gpu/include/GrIPoint.h',
-        '../third_party/skia/gpu/include/GrInOrderDrawBuffer.h',
-        '../third_party/skia/gpu/include/GrIndexBuffer.h',
-        '../third_party/skia/gpu/include/GrInstanceCounter.h',
-        '../third_party/skia/gpu/include/GrKey.h',
-        '../third_party/skia/gpu/include/GrMatrix.h',
-        '../third_party/skia/gpu/include/GrMemory.h',
-        '../third_party/skia/gpu/include/GrMesh.h',
-        '../third_party/skia/gpu/include/GrNoncopyable.h',
-        '../third_party/skia/gpu/include/GrPath.h',
-        '../third_party/skia/gpu/include/GrPathIter.h',
-        '../third_party/skia/gpu/include/GrPathSink.h',
-        '../third_party/skia/gpu/include/GrPoint.h',
-        '../third_party/skia/gpu/include/GrRandom.h',
-        '../third_party/skia/gpu/include/GrRect.h',
-        '../third_party/skia/gpu/include/GrRectanizer.h',
-        '../third_party/skia/gpu/include/GrRefCnt.h',
-        '../third_party/skia/gpu/include/GrSamplerState.h',
-        '../third_party/skia/gpu/include/GrScalar.h',
-        '../third_party/skia/gpu/include/GrStopwatch.h',
-        '../third_party/skia/gpu/include/GrStringBuilder.h',
-        '../third_party/skia/gpu/include/GrTArray.h',
-        '../third_party/skia/gpu/include/GrTBSearch.h',
-        '../third_party/skia/gpu/include/GrTDArray.h',
-        '../third_party/skia/gpu/include/GrTHashCache.h',
-        '../third_party/skia/gpu/include/GrTLList.h',
-        '../third_party/skia/gpu/include/GrTextContext.h',
-        '../third_party/skia/gpu/include/GrTextStrike.h',
-        '../third_party/skia/gpu/include/GrTexture.h',
-        '../third_party/skia/gpu/include/GrTextureCache.h',
-        '../third_party/skia/gpu/include/GrTypes.h',
-        '../third_party/skia/gpu/include/GrUserConfig.h',
-        '../third_party/skia/gpu/include/GrVertexBuffer.h',
-        '../third_party/skia/gpu/include/GrVertexBufferAllocPool.h',
-
         #'../third_party/skia/src/animator/SkAnimate.h',
         #'../third_party/skia/src/animator/SkAnimateActive.cpp',
         #'../third_party/skia/src/animator/SkAnimateActive.h',
         #'../third_party/skia/src/animator/SkAnimateBase.cpp',
         #'../third_party/skia/src/animator/SkAnimateBase.h',
         #'../third_party/skia/src/animator/SkAnimateField.cpp',
         #'../third_party/skia/src/animator/SkAnimateMaker.cpp',
         #'../third_party/skia/src/animator/SkAnimateMaker.h',
         #'../third_party/skia/src/animator/SkAnimateProperties.h',
         #'../third_party/skia/src/animator/SkAnimateSchema.xsd',
@@ skipping 298 matching lines @@
         '../third_party/skia/src/effects/SkGradientShader.cpp',
         '../third_party/skia/src/effects/SkKernel33MaskFilter.cpp',
         '../third_party/skia/src/effects/SkLayerDrawLooper.cpp',
         '../third_party/skia/src/effects/SkLayerRasterizer.cpp',
         '../third_party/skia/src/effects/SkPaintFlagsDrawFilter.cpp',
         '../third_party/skia/src/effects/SkPorterDuff.cpp',
         '../third_party/skia/src/effects/SkPixelXorXfermode.cpp',
         '../third_party/skia/src/effects/SkRadialGradient_Table.h',
         '../third_party/skia/src/effects/SkTransparentShader.cpp',
 
-        '../third_party/skia/src/gpu/SkGpuCanvas.cpp',
-        '../third_party/skia/src/gpu/SkGpuDevice.cpp',
-        '../third_party/skia/src/gpu/GrPrintf_skia.cpp',
-        '../third_party/skia/src/gpu/SkGrFontScaler.cpp',
-        '../third_party/skia/src/gpu/SkGr.cpp',
-        '../third_party/skia/src/gpu/SkGrTexturePixelRef.cpp',
-
         '../third_party/skia/src/images/bmpdecoderhelper.cpp',
         '../third_party/skia/src/images/bmpdecoderhelper.h',
         '../third_party/skia/src/images/fpdfemb.h',
         '../third_party/skia/src/images/fpdfemb_ext.h',
         '../third_party/skia/src/images/SkBitmap_RLEPixels.h',
         '../third_party/skia/src/images/SkCreateRLEPixelRef.cpp',
         #'../third_party/skia/src/images/SkFDStream.cpp',
         #'../third_party/skia/src/images/SkFlipPixelRef.cpp',
         '../third_party/skia/src/images/SkImageDecoder.cpp',
         '../third_party/skia/src/images/SkImageDecoder_Factory.cpp',
@@ skipping 145 matching lines @@
         '../third_party/skia/include/effects/SkEmbossMaskFilter.h',
         '../third_party/skia/include/effects/SkGradientShader.h',
         '../third_party/skia/include/effects/SkKernel33MaskFilter.h',
         '../third_party/skia/include/effects/SkLayerDrawLooper.h',
         '../third_party/skia/include/effects/SkLayerRasterizer.h',
         '../third_party/skia/include/effects/SkNWayCanvas.h',
         '../third_party/skia/include/effects/SkPaintFlagsDrawFilter.h',
         '../third_party/skia/include/effects/SkPixelXorXfermode.h',
         '../third_party/skia/include/effects/SkTransparentShader.h',
 
-        '../third_party/skia/include/gpu/SkGpuCanvas.h',
-        '../third_party/skia/include/gpu/SkGpuDevice.h',
-        '../third_party/skia/include/gpu/SkGpuDeviceFactory.h',
-        '../third_party/skia/include/gpu/SkGr.h',
-        '../third_party/skia/include/gpu/SkGrTexturePixelRef.h',
-
         '../third_party/skia/include/ports/SkStream_Win.h',
 
         '../third_party/skia/include/images/SkFlipPixelRef.h',
         '../third_party/skia/include/images/SkImageDecoder.h',
         '../third_party/skia/include/images/SkImageEncoder.h',
         '../third_party/skia/include/images/SkImageRef.h',
         '../third_party/skia/include/images/SkImageRef_GlobalPool.h',
         '../third_party/skia/include/images/SkMovie.h',
         '../third_party/skia/include/images/SkPageFlipper.h',
 
@@ skipping 38 matching lines @@
         'ext/vector_platform_device_linux.h',
         'ext/vector_platform_device_win.cc',
         'ext/vector_platform_device_win.h',
       ],
       'include_dirs': [
         '..',
         'config',
         '../third_party/skia/include/config',
         '../third_party/skia/include/core',
         '../third_party/skia/include/effects',
-        '../third_party/skia/include/gpu',
         '../third_party/skia/include/images',
         '../third_party/skia/include/utils',
-        '../third_party/skia/gpu/include',
-        '../third_party/skia/gpu/src',
         '../third_party/skia/src/core',
-
-        '../gpu',
       ],
       'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800],
       'mac_framework_dirs': [
         '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
       ],
       'defines': [
         'SK_BUILD_NO_IMAGE_ENCODE',
-        'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
-        'GR_SKIP_2POINTRADIAL_PROGRAMS',
       ],
       'sources!': [
         '../third_party/skia/include/core/SkTypes.h',
       ],
       'conditions': [
         [ 'OS != "mac"', {
           'sources/': [
             ['exclude', '_mac\\.(cc|cpp|mm?)$'],
             ['exclude', '/mac/'] ],
         }],
@@ skipping 82 matching lines @@
       ],
       'dependencies': [
         'skia_opts'
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'config',
           '../third_party/skia/include/config',
           '../third_party/skia/include/core',
           '../third_party/skia/include/effects',
-          '../third_party/skia/include/gpu',
-          '../third_party/skia/gpu/include',
           'ext',
         ],
         'mac_framework_dirs': [
           '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
         ],
       },
     },
 
     # Due to an unfortunate intersection of lameness between gcc and gyp,
     # we have to build the *_SSE2.cpp files in a separate target.  The
     # gcc lameness is that, in order to compile SSE2 intrinsics code, it
-    # must be passed the -msse2 flag.  However, with this flag, it may
+    # must be passed the -msse2 flag.  However, with this flag, it may 
     # emit SSE2 instructions even for scalar code, such as the CPUID
     # test used to test for the presence of SSE2.  So that, and all other
     # code must be compiled *without* -msse2.  The gyp lameness is that it
     # does not allow file-specific CFLAGS, so we must create this extra
     # target for those files to be compiled with -msse2.
     #
     # This is actually only a problem on 32-bit Linux (all Intel Macs have
     # SSE2, Linux x86_64 has SSE2 by definition, and MSC will happily emit
     # SSE2 from instrinsics, which generating plain ol' 386 for everything
     # else).  However, to keep the .gyp file simple and avoid platform-specific
@@ skipping 54 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: