From 784548a551dca9b07723cb10323934b7e078d93a Mon Sep 17 00:00:00 2001 From: brettw Date: Tue, 6 Sep 2016 11:39:46 -0700 Subject: Use new Skia .gni file for sources, remove .gypis. This incorporates the changes from the following Chrome Skia build modifications: https://codereview.chromium.org/2301233002/ This file is provided by the Skia repo so the GN Chrome build doesn't have to make assumptions about the location and layout of Skia's GYP files. https://codereview.chromium.org/2299033006 Remove Skia GYP files from Chromium tree. Inlines the contents into the GN build. Review-Url: https://codereview.chromium.org/2316653003 --- skia/skia_library.gypi | 305 ------------------------------------------------- 1 file changed, 305 deletions(-) delete mode 100644 skia/skia_library.gypi (limited to 'skia/skia_library.gypi') diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi deleted file mode 100644 index e933732410..0000000000 --- a/skia/skia_library.gypi +++ /dev/null @@ -1,305 +0,0 @@ -# Copyright 2013 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 gypi file contains the Skia library. -# In component mode (shared_lib) it is folded into a single shared library with -# the PDFium-specific enhancements but in all other cases it is a separate lib. - -# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -# variables and defines should go in skia_common.gypi so they can be seen -# by files listed here and in skia_library_opts.gypi. -# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -{ - 'dependencies': [ - 'skia_library_opts.gyp:skia_opts', - '../third_party/third_party.gyp:fx_zlib', - ], - - 'includes': [ - '../third_party/skia/gyp/core.gypi', - '../third_party/skia/gyp/effects.gypi', - '../third_party/skia/gyp/pdf.gypi', - '../third_party/skia/gyp/utils.gypi', - ], - - 'sources': [ - '../third_party/skia/src/lazy/SkDiscardableMemoryPool.cpp', - - '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp', - '../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp', - - '../third_party/skia/src/ports/SkDiscardableMemory_none.cpp', - - '../third_party/skia/src/fonts/SkFontMgr_indirect.cpp', - '../third_party/skia/src/fonts/SkRemotableFontMgr.cpp', - '../third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp', - - '../third_party/skia/src/ports/SkImageEncoder_none.cpp', - '../third_party/skia/src/ports/SkImageGenerator_none.cpp', - - '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', - '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp', - '../third_party/skia/src/ports/SkFontHost_win.cpp', - "../third_party/skia/src/ports/SkFontMgr_android.cpp", - "../third_party/skia/src/ports/SkFontMgr_android_factory.cpp", - '../third_party/skia/src/ports/SkFontMgr_android_parser.cpp', - '../third_party/skia/src/ports/SkFontMgr_custom.cpp', - '../third_party/skia/src/ports/SkFontMgr_custom_empty_factory.cpp', - - '../third_party/skia/src/ports/SkGlobalInitialization_default.cpp', - '../third_party/skia/src/ports/SkMemory_malloc.cpp', - '../third_party/skia/src/ports/SkOSFile_posix.cpp', - '../third_party/skia/src/ports/SkOSFile_stdio.cpp', - '../third_party/skia/src/ports/SkOSFile_win.cpp', - '../third_party/skia/src/ports/SkScalerContext_win_dw.cpp', - '../third_party/skia/src/ports/SkTLS_pthread.cpp', - '../third_party/skia/src/ports/SkTLS_win.cpp', - '../third_party/skia/src/ports/SkTypeface_win_dw.cpp', - - '../third_party/skia/src/sfnt/SkOTTable_name.cpp', - '../third_party/skia/src/sfnt/SkOTUtils.cpp', - ], - - # Exclude all unused files in skia utils.gypi file - 'sources!': [ - '../third_party/skia/src/utils/SkBoundaryPatch.cpp', - '../third_party/skia/src/utils/SkFrontBufferedStream.cpp', - '../third_party/skia/src/utils/SkCamera.cpp', - '../third_party/skia/src/utils/SkDumpCanvas.cpp', - '../third_party/skia/src/utils/SkInterpolator.cpp', - '../third_party/skia/src/utils/SkLayer.cpp', - '../third_party/skia/src/utils/SkMD5.cpp', - '../third_party/skia/src/utils/SkMeshUtils.cpp', - '../third_party/skia/src/utils/SkNinePatch.cpp', - '../third_party/skia/src/utils/SkParsePath.cpp', - -#windows - '../third_party/skia/src/utils/win/SkAutoCoInitialize.cpp', - '../third_party/skia/src/utils/win/SkIStream.cpp', - '../third_party/skia/src/utils/win/SkWGL_win.cpp', - -#testing - '../third_party/skia/src/fonts/SkGScalerContext.cpp', - ], - - 'include_dirs': [ - '../third_party/skia/include/c', - '../third_party/skia/include/core', - '../third_party/skia/include/client/android', - '../third_party/skia/include/effects', - '../third_party/skia/include/images', - '../third_party/skia/include/lazy', - '../third_party/skia/include/pathops', - '../third_party/skia/include/pdf', - '../third_party/skia/include/pipe', - '../third_party/skia/include/ports', - '../third_party/skia/include/private', - '../third_party/skia/include/utils', - '../third_party/skia/src/core', - '../third_party/skia/src/opts', - '../third_party/skia/src/image', - '../third_party/skia/src/pdf', - '../third_party/skia/src/ports', - '../third_party/skia/src/sfnt', - '../third_party/skia/src/utils', - '../third_party/skia/src/lazy', - # TODO(dsinclair): Right way to use third_party.gyp:fx_freetype? - '../third_party/freetype/include', - ], - 'conditions': [ - ['skia_support_gpu != 0', { - 'includes': [ - '../third_party/skia/gyp/gpu.gypi', - ], - 'sources': [ - '<@(skgpu_null_gl_sources)', - '<@(skgpu_sources)', - ], - 'include_dirs': [ - '../third_party/skia/include/gpu', - '../third_party/skia/src/gpu', - ], - }], - ['skia_support_pdf == 0', { - 'sources/': [ - ['exclude', '../third_party/skia/src/doc/SkDocument_PDF.cpp'], - ['exclude', '../third_party/skia/src/pdf/'], - ], - }], - ['skia_support_pdf == 1', { - 'dependencies': [ - '../third_party/sfntly/sfntly.gyp:sfntly', - ], - }], - - [ 'OS == "win"', { - 'sources!': [ - # Keeping _win.cpp - "../third_party/skia/src/utils/SkThreadUtils_pthread.cpp", - ], - 'dependencies': [ - '../third_party/third_party.gyp:fx_freetype' - ], - },{ - 'sources!': [ - # Keeping _pthread.cpp - "../third_party/skia/src/utils/SkThreadUtils_win.cpp", - ], - }], - - [ 'OS != "mac"', { - 'sources/': [ - ['exclude', '/mac/'] - ], - }], - [ 'OS == "android" and target_arch == "arm"', { - 'sources': [ - '../third_party/skia/src/core/SkUtilsArm.cpp', - ], - }], - [ 'OS=="linux"', { - 'dependencies': [ - '../third_party/third_party.gyp:fx_freetype' - ], - 'cflags': [ - '-Wno-unused', - '-Wno-unused-function', - ], - }], - [ 'OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', { - 'sources!': [ - '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp', - '../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp', - '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp', - '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp', - ], - }], - [ 'OS=="mac" or OS=="ios"', { - 'sources!': [ - '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', - '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp', - - ], - }], - [ 'OS == "android"', { - 'dependencies': [ - '../third_party/expat/expat.gyp:expat', - '../third_party/freetype-android/freetype.gyp:ft2', - ], - # This exports a hard dependency because it needs to run its - # symlink action in order to expose the skia header files. - 'hard_dependency': 1, - 'include_dirs': [ - '../third_party/expat/files/lib', - ], - },{ # not 'OS == "android"' - 'sources!': [ - "../third_party/skia/src/ports/SkFontMgr_android_factory.cpp", - '../third_party/skia/src/ports/SkFontMgr_android_parser.cpp', - ], - }], - [ 'OS == "ios"', { - 'include_dirs': [ - '../third_party/skia/include/utils/ios', - '../third_party/skia/include/utils/mac', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework', - ], - }, - 'sources': [ - # This file is used on both iOS and Mac, so it should be removed - # from the ios and mac conditions and moved into the main sources - # list. - '../third_party/skia/src/utils/mac/SkStream_mac.cpp', - ], - - # The main skia_opts target does not currently work on iOS because the - # target architecture on iOS is determined at compile time rather than - # gyp time (simulator builds are x86, device builds are arm). As a - # temporary measure, this is a separate opts target for iOS-only, using - # the _none.cpp files to avoid architecture-dependent implementations. - 'dependencies': [ - 'skia_library_opts.gyp:skia_opts_none', - ], - 'dependencies!': [ - 'skia_library_opts.gyp:skia_opts', - ], - }], - [ 'OS == "mac"', { - 'direct_dependent_settings': { - 'include_dirs': [ - '../third_party/skia/include/utils/mac', - ], - }, - 'include_dirs': [ - '../third_party/skia/include/utils/mac', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', - ], - }, - 'sources': [ - '../third_party/skia/src/utils/mac/SkStream_mac.cpp', - ], - }], - [ 'OS == "win"', { - 'sources!': [ - '../third_party/skia/src/ports/SkOSFile_posix.cpp', - '../third_party/skia/src/ports/SkTime_Unix.cpp', - '../third_party/skia/src/ports/SkTLS_pthread.cpp', - ], - 'include_dirs': [ - '../third_party/skia/include/utils/win', - '../third_party/skia/src/utils/win', - ], - },{ # not 'OS == "win"' - 'sources!': [ - '../third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp', - '../third_party/skia/src/ports/SkScalerContext_win_dw.cpp', - '../third_party/skia/src/ports/SkTypeface_win_dw.cpp', - - '../third_party/skia/src/utils/win/SkDWrite.cpp', - '../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp', - '../third_party/skia/src/utils/win/SkDWriteGeometrySink.cpp', - '../third_party/skia/src/utils/win/SkHRESULT.cpp', - ], - }], - ], - 'target_conditions': [ - # Pull in specific Mac files for iOS (which have been filtered out - # by file name rules). - [ 'OS == "ios"', { - 'sources/': [ - ['include', 'SkFontHost_mac\\.cpp$',], - ['include', 'SkStream_mac\\.cpp$',], - ['include', 'SkCreateCGImageRef\\.cpp$',], - ], - 'xcode_settings' : { - 'WARNING_CFLAGS': [ - # SkFontHost_mac.cpp uses API deprecated in iOS 7. - # crbug.com/408571 - '-Wno-deprecated-declarations', - ], - }, - }], - ], - - 'direct_dependent_settings': { - 'include_dirs': [ - '../third_party/skia/include/core', - '../third_party/skia/include/effects', - '../third_party/skia/include/pdf', - '../third_party/skia/include/gpu', - '../third_party/skia/include/lazy', - '../third_party/skia/include/pathops', - '../third_party/skia/include/pipe', - '../third_party/skia/include/ports', - '../third_party/skia/include/utils', - ], - }, -} -- cgit v1.2.3