e6088c6063
Reason for revert: The broke the PDFium build. See https://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Release-PDFium/builds/2094 Original issue's description: > Move uils and sksl to a common sources GYP file. > > This is for the coalescing of sources in one GYP file to improve GN runtime. If > this is successful, the other sources lists will also be merged into this one > file. > > Inlines "../src" and "../include" for skia_source_dir and skia_include_dir. Evaluating these with GYP's variable expansion is annoying since I think another layer of nesting is required. Coding these explicitly is also more clear. This used to be required because Chromium would reference these .gypi files directly with a different path, but this no longer happens. > > Removes the chromium defines gypi which is no longer referenced. > > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2302723005 > > Committed: https://skia.googlesource.com/skia/+/39f7a10a04a914384944d8bf62621144ac4eeaa3 TBR=mtklein@chromium.org,brettw@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. Review-Url: https://codereview.chromium.org/2317683002
102 lines
2.9 KiB
Python
102 lines
2.9 KiB
Python
# Copyright 2015 Google Inc.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
# Gyp for utils.
|
|
{
|
|
'targets': [
|
|
{
|
|
'target_name': 'utils',
|
|
'product_name': 'skia_utils',
|
|
'type': 'static_library',
|
|
'standalone_static_library': 1,
|
|
'dependencies': [
|
|
'core.gyp:*',
|
|
'etc1.gyp:libetc1',
|
|
],
|
|
'includes': [
|
|
'utils.gypi',
|
|
],
|
|
'include_dirs': [
|
|
'../include/effects',
|
|
'../include/gpu',
|
|
'../include/images',
|
|
'../include/pathops',
|
|
'../include/private',
|
|
'../include/utils',
|
|
'../include/utils/mac',
|
|
'../src/core',
|
|
'../src/gpu',
|
|
'../src/image',
|
|
'../src/opts',
|
|
'../src/utils',
|
|
'../src/utils/win',
|
|
],
|
|
'sources': [
|
|
'utils.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
|
|
],
|
|
'conditions': [
|
|
[ 'skia_os == "mac"', {
|
|
'link_settings': {
|
|
'libraries': [
|
|
'$(SDKROOT)/System/Library/Frameworks/AGL.framework',
|
|
],
|
|
},
|
|
}],
|
|
[ 'skia_os in ["mac", "ios"]', {
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [
|
|
'../include/utils/mac',
|
|
],
|
|
},
|
|
},{ #else if 'skia_os != "mac"'
|
|
'include_dirs!': [
|
|
'../include/utils/mac',
|
|
],
|
|
'sources!': [
|
|
'../include/utils/mac/SkCGUtils.h',
|
|
'../src/utils/mac/SkCreateCGImageRef.cpp',
|
|
],
|
|
}],
|
|
[ 'skia_os == "win"', {
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [
|
|
'../src/utils/win',
|
|
],
|
|
},
|
|
'sources!': [
|
|
'../src/utils/SkThreadUtils_pthread.cpp',
|
|
'../src/utils/SkThreadUtils_pthread.h',
|
|
],
|
|
},{ #else if 'skia_os != "win"'
|
|
'include_dirs!': [
|
|
'../src/utils/win',
|
|
],
|
|
'sources/': [ ['exclude', '_win.(h|cpp)$'],],
|
|
'sources!': [
|
|
'../src/utils/win/SkAutoCoInitialize.h',
|
|
'../src/utils/win/SkAutoCoInitialize.cpp',
|
|
'../src/utils/win/SkDWrite.h',
|
|
'../src/utils/win/SkDWrite.cpp',
|
|
'../src/utils/win/SkDWriteFontFileStream.cpp',
|
|
'../src/utils/win/SkDWriteFontFileStream.h',
|
|
'../src/utils/win/SkDWriteGeometrySink.cpp',
|
|
'../src/utils/win/SkDWriteGeometrySink.h',
|
|
'../src/utils/win/SkHRESULT.h',
|
|
'../src/utils/win/SkHRESULT.cpp',
|
|
'../src/utils/win/SkIStream.h',
|
|
'../src/utils/win/SkIStream.cpp',
|
|
'../src/utils/win/SkTScopedComPtr.h',
|
|
],
|
|
}],
|
|
],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [
|
|
'../include/utils',
|
|
'../src/utils',
|
|
],
|
|
},
|
|
},
|
|
],
|
|
}
|