aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
Diffstat (limited to 'gyp')
-rw-r--r--gyp/SampleApp.gyp8
-rw-r--r--gyp/codec.gyp5
-rw-r--r--gyp/common.gypi6
-rw-r--r--gyp/common_conditions.gypi38
-rw-r--r--gyp/core.gyp2
-rw-r--r--gyp/debugger.gyp2
-rw-r--r--gyp/everything.gyp2
-rw-r--r--gyp/freetype.gyp2
-rw-r--r--gyp/gpu.gyp8
-rw-r--r--gyp/gputest.gyp8
-rw-r--r--gyp/icu.gyp2
-rw-r--r--gyp/images.gyp5
-rw-r--r--gyp/libjpeg-turbo.gyp2
-rw-r--r--gyp/pdf.gyp2
-rw-r--r--gyp/ports.gyp2
-rw-r--r--gyp/sfntly.gyp2
-rw-r--r--gyp/tests.gypi2
-rw-r--r--gyp/utils.gyp4
-rw-r--r--gyp/views.gyp2
19 files changed, 39 insertions, 65 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 52061f28b3..ea7ab980cd 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -254,14 +254,6 @@
'android_deps.gyp:Android_SampleApp',
],
}],
- [ 'skia_os == "chromeos"', {
- 'sources!': [
- '../samplecode/SampleLighting.cpp', #doesn't compile due to gpu dependencies
- ],
- 'include_dirs' : [
- '../include/gpu',
- ],
- }],
[ 'skia_gpu == 1', {
'dependencies': [
'gputest.gyp:skgputest',
diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index a31c1cc0d2..bea740b9d1 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -135,11 +135,6 @@
'OTHER_CPLUSPLUSFLAGS': ['-fexceptions'],
},
}],
- ['skia_os == "chromeos"', {
- 'link_settings': {
- 'libraries': ['-lrt', ],
- },
- }],
],
},
],
diff --git a/gyp/common.gypi b/gyp/common.gypi
index 9ca2895d54..757d9c2d08 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -26,8 +26,7 @@
# situations, like building for iOS on a Mac.
'variables': {
'conditions': [
- [ 'skia_os != OS and not ((skia_os == "ios" and OS == "mac") or \
- (skia_os == "chromeos" and OS == "linux"))', {
+ [ 'skia_os != OS and not (skia_os == "ios" and OS == "mac")', {
'error': '<!(Cannot build with skia_os=<(skia_os) on OS=<(OS))',
}],
[ 'skia_mesa and skia_os not in ["mac", "linux"]', {
@@ -36,9 +35,6 @@
[ 'skia_angle and not (skia_os == "win" or skia_os == "linux" or skia_os == "mac")', {
'error': '<!(skia_angle=1 only supported with skia_os="win" or skia_os="linux" or skia_os="mac".)',
}],
- [ 'skia_os == "chromeos" and OS != "linux"', {
- 'error': '<!(Skia ChromeOS build is only supported on Linux.)',
- }],
],
},
'includes': [
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index aee65daf42..0f8fa51430 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -218,7 +218,7 @@
],
# The following section is common to linux + derivatives and android
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "android"]',
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android"]',
{
'cflags': [
'-g',
@@ -242,24 +242,20 @@
'ldflags': [ '-rdynamic' ],
'conditions': [
[ 'skia_fast', { 'cflags': [ '<@(skia_fast_flags)' ] }],
- [ 'skia_os != "chromeos"', {
- 'conditions': [
- [ 'skia_arch_type == "x86_64" and not skia_android_framework', {
- 'cflags': [
- '-m64',
- ],
- 'ldflags': [
- '-m64',
- ],
- }],
- [ 'skia_arch_type == "x86" and not skia_android_framework', {
- 'cflags': [
- '-m32',
- ],
- 'ldflags': [
- '-m32',
- ],
- }],
+ [ 'skia_arch_type == "x86_64" and not skia_android_framework', {
+ 'cflags': [
+ '-m64',
+ ],
+ 'ldflags': [
+ '-m64',
+ ],
+ }],
+ [ 'skia_arch_type == "x86" and not skia_android_framework', {
+ 'cflags': [
+ '-m32',
+ ],
+ 'ldflags': [
+ '-m32',
],
}],
[ 'skia_warnings_as_errors', {
@@ -298,7 +294,7 @@
'SK_ARM_HAS_OPTIONAL_NEON',
],
}],
- [ 'skia_os != "chromeos" and skia_os != "linux"', {
+ [ 'skia_os != "linux"', {
'cflags': [
'-mfloat-abi=softfp',
],
@@ -409,7 +405,7 @@
'defines': [ 'SK_DUMP_STATS'],
}],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]',
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]',
{
'defines': [
'SK_SAMPLES_FOR_X',
diff --git a/gyp/core.gyp b/gyp/core.gyp
index b0cbbf9bb0..e6f7e8caa1 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -36,7 +36,7 @@
],
'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800],
'conditions': [
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
'link_settings': {
'libraries': [
'-lpthread',
diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp
index f6e19881c8..8ad570284f 100644
--- a/gyp/debugger.gyp
+++ b/gyp/debugger.gyp
@@ -6,7 +6,7 @@
'variables': {
'skia_warnings_as_errors': 0,
'conditions': [
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
# Use the systemwide Qt libs by default
'variables': {
'qt_sdk%': '/usr',
diff --git a/gyp/everything.gyp b/gyp/everything.gyp
index 47db978171..299aad5c5b 100644
--- a/gyp/everything.gyp
+++ b/gyp/everything.gyp
@@ -21,7 +21,7 @@
'skiaserve.gyp:skiaserve',
],
'conditions': [
- ['skia_os in ("ios", "android", "chromeos")', {
+ ['skia_os in ("ios", "android")', {
# debugger is not supported on this platform
}, {
'dependencies': [
diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp
index d68d33ad97..6ebd168498 100644
--- a/gyp/freetype.gyp
+++ b/gyp/freetype.gyp
@@ -33,7 +33,7 @@
}, { # (not skia_freetype_static)
# dynamic linking depends on the OS:
'conditions': [
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]',
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]',
{
'direct_dependent_settings': {
'include_dirs' : [
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 2fedbed93c..f09bcd0fc6 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -14,7 +14,7 @@
'sources/': [ ['exclude', '_mac.(h|cpp|m|mm)$'],
],
}],
- ['skia_os != "linux" and skia_os != "chromeos"', {
+ ['skia_os != "linux"', {
'sources/': [ ['exclude', '_glx.(h|cpp)$'],
],
}],
@@ -123,13 +123,13 @@
'GR_CHROME_UTILS=1',
],
}],
- [ 'skia_os == "linux" or skia_os == "chromeos"', {
+ [ 'skia_os == "linux"', {
'sources!': [
'../src/gpu/gl/GrGLDefaultInterface_none.cpp',
'../src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
],
}],
- [ '(skia_os == "linux" or skia_os == "chromeos") and skia_egl == 1', {
+ [ 'skia_os == "linux" and skia_egl == 1', {
'link_settings': {
'libraries': [
'-lEGL',
@@ -137,7 +137,7 @@
],
},
}],
- [ '(skia_os == "linux" or skia_os == "chromeos") and skia_egl == 0', {
+ [ 'skia_os == "linux" and skia_egl == 0', {
'link_settings': {
'libraries': [
'-lGL',
diff --git a/gyp/gputest.gyp b/gyp/gputest.gyp
index d1067e5f99..746fea180e 100644
--- a/gyp/gputest.gyp
+++ b/gyp/gputest.gyp
@@ -41,7 +41,7 @@
'angle.gyp:*',
],
}],
- [ '(skia_os == "linux" or skia_os == "chromeos") and skia_egl == 1', {
+ [ 'skia_os == "linux" and skia_egl == 1', {
'link_settings': {
'libraries': [
'-lEGL',
@@ -49,7 +49,7 @@
],
},
}],
- [ '(skia_os == "linux" or skia_os == "chromeos") and skia_egl == 0', {
+ [ 'skia_os == "linux" and skia_egl == 0', {
'link_settings': {
'libraries': [
'-lGL',
@@ -69,7 +69,7 @@
],
},
}],
- ['skia_os in ["linux", "win", "mac", "chromeos", "android", "ios"]', {
+ ['skia_os in ["linux", "win", "mac", "android", "ios"]', {
'sources/': [ ['exclude', '_none\.(h|cpp)$'],],
}],
['skia_os != "win"', {
@@ -78,7 +78,7 @@
['skia_os != "mac"', {
'sources/': [ ['exclude', '_mac\.(h|cpp|m|mm)$'],],
}],
- ['skia_os != "linux" and skia_os != "chromeos"', {
+ ['skia_os != "linux"', {
'sources/': [ ['exclude', '_glx\.(h|cpp)$'],],
}],
['skia_os != "ios"', {
diff --git a/gyp/icu.gyp b/gyp/icu.gyp
index 5142b77ed6..4a985032c2 100644
--- a/gyp/icu.gyp
+++ b/gyp/icu.gyp
@@ -112,7 +112,7 @@
}
],
[
- 'skia_os in ["linux", "chromeos"]', {
+ 'skia_os == "linux"', {
'sources': [ '<(icu_directory)/linux/icudtl_dat.S', ],
}
],
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 2701b50b9a..8920f6ad4d 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -107,11 +107,6 @@
}],
],
}],
- [ 'skia_os == "chromeos"', {
- 'dependencies': [
- 'libpng.gyp:libpng',
- ],
- }],
[ 'skia_os == "ios"', {
'include_dirs': [
'../include/utils/mac',
diff --git a/gyp/libjpeg-turbo.gyp b/gyp/libjpeg-turbo.gyp
index 407fccaff0..801b21e612 100644
--- a/gyp/libjpeg-turbo.gyp
+++ b/gyp/libjpeg-turbo.gyp
@@ -293,7 +293,7 @@
},
}],
[ '(skia_os == "linux" or skia_os == "freebsd" or skia_os == "openbsd" or \
- skia_os == "solaris" or skia_os == "chromeos")', {
+ skia_os == "solaris")', {
'dependencies': [
'yasm.gyp:yasm#host',
],
diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp
index a640833db4..bc240b1059 100644
--- a/gyp/pdf.gyp
+++ b/gyp/pdf.gyp
@@ -39,7 +39,7 @@
],
'conditions': [
[ 'skia_pdf_use_sfntly and not skia_android_framework and \
- skia_os in ["win", "android", "linux", "chromeos", "mac"]',
+ skia_os in ["win", "android", "linux", "mac"]',
{ 'dependencies': [ 'sfntly.gyp:sfntly' ] }
],
[ 'skia_pdf_less_compression',
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 25db385a91..fa3db46391 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -74,7 +74,7 @@
['exclude', 'SkFontMgr_.+_factory\\.cpp$'],
],
'conditions': [
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "android"]', {
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
'sources': [
'../src/ports/SkFontHost_FreeType.cpp',
'../src/ports/SkFontHost_FreeType_common.cpp',
diff --git a/gyp/sfntly.gyp b/gyp/sfntly.gyp
index 4e3ca5f47a..b23a7db0f2 100644
--- a/gyp/sfntly.gyp
+++ b/gyp/sfntly.gyp
@@ -44,7 +44,7 @@
},
}
],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]',
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]',
{ 'link_settings': { 'libraries': [ '-lpthread', ], }, },
],
],
diff --git a/gyp/tests.gypi b/gyp/tests.gypi
index dfce3c0849..f8e4095c30 100644
--- a/gyp/tests.gypi
+++ b/gyp/tests.gypi
@@ -29,7 +29,7 @@
'zlib.gyp:zlib',
],
'conditions': [
- [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "android"]', {
+ [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
'sources!': [ '../tests/FontMgrAndroidParserTest.cpp', ],
}],
[ 'not skia_pdf', {
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 2384307045..4cd71a7b60 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -59,8 +59,8 @@
'../src/utils/mac/SkCreateCGImageRef.cpp',
],
}],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
- },{ #else if 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]'
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
+ },{ #else if 'skia_os not in ["linux", "freebsd", "openbsd", "solaris"]'
'include_dirs!': [
'../include/utils/unix',
],
diff --git a/gyp/views.gyp b/gyp/views.gyp
index 7b5eb78133..4ba6174e7b 100644
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -98,7 +98,7 @@
'../src/views/mac/skia_mac.mm',
],
}],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"] and skia_use_sdl == 0', {
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"] and skia_use_sdl == 0', {
'link_settings': {
'libraries': [
'-lGL',
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 10:20:18 +0000