Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(648)

Unified Diff: skia/skia_library_opts.gyp

Issue 2316653003: Use new Skia .gni file for sources, remove .gypis. (Closed)
Patch Set: More path Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « skia/skia_library.gypi ('k') | skia/skia_pdfium.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia_library_opts.gyp
diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp
deleted file mode 100644
index 32b69bb164fbe787d452d93c552bfdaf58e40da2..0000000000000000000000000000000000000000
--- a/skia/skia_library_opts.gyp
+++ /dev/null
@@ -1,330 +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 gyp file contains the platform-specific optimizations for Skia
-{
- 'variables': {
- 'skia_src_path': '../third_party/skia/src',
- 'includes': [ '../third_party/skia/gyp/opts.gypi' ],
- 'include_dirs': [
- '../third_party/skia/include/core',
- '../third_party/skia/include/effects',
- '../third_party/skia/include/private',
- '../third_party/skia/include/utils',
- '../third_party/skia/src/core',
- '../third_party/skia/src/opts',
- '../third_party/skia/src/utils',
- ],
- },
-
- 'targets': [
- # SSE files have to be built in a separate target, because gcc needs
- # different -msse flags for different SSE levels which enable use of SSE
- # intrinsics but also allow emission of SSE2 instructions for scalar code.
- # gyp does not allow per-file compiler flags.
- # For about the same reason, we need to compile the ARM opts files
- # separately as well.
- {
- 'target_name': 'skia_opts',
- 'type': 'static_library',
- # The optimize: 'max' scattered throughout are particularly
- # important when compiled by MSVC 2013, which seems
- # to mis-link-time-compile code that's built with
- # different optimization levels. http://crbug.com/543583
- 'variables': {
- 'optimize': 'max',
- },
- 'includes': [
- 'skia_common.gypi',
- ],
- 'include_dirs': [ '<@(include_dirs)' ],
- 'conditions': [
- [ 'target_arch != "arm" and target_arch != "mipsel" and \
- target_arch != "arm64" and target_arch != "mips64el"', {
- # Chrome builds with -msse2 locally, so sse2_sources could in theory
- # be in the regular skia target. But we need skia_opts for arm
- # anyway, so putting sse2_sources here is simpler than making this
- # conditionally a type none target on x86.
- 'sources': [ '<@(sse2_sources)' ],
- 'dependencies': [
- 'skia_opts_ssse3',
- 'skia_opts_sse41',
- 'skia_opts_sse42',
- 'skia_opts_avx',
- 'skia_opts_avx2',
- ],
- }],
- [ 'target_arch == "arm"', {
- 'conditions': [
- [ 'arm_version >= 7', {
- 'sources': [ '<@(armv7_sources)' ],
- }, { # arm_version < 7
- 'sources': [ '<@(none_sources)' ],
- }],
- [ 'arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', {
- 'dependencies': [
- 'skia_opts_neon',
- ]
- }],
- ],
- # The assembly uses the frame pointer register (r7 in Thumb/r11 in
- # ARM), the compiler doesn't like that. Explicitly remove the
- # -fno-omit-frame-pointer flag for Android, as that gets added to all
- # targets via common.gypi.
- 'cflags!': [
- '-fno-omit-frame-pointer',
- '-marm',
- '-mapcs-frame',
- ],
- 'cflags': [
- '-fomit-frame-pointer',
- ],
- }],
- [ 'target_arch == "mipsel"',{
- 'cflags': [ '-fomit-frame-pointer' ],
- 'conditions': [
- [ 'mips_dsp_rev >= 1', {
- 'sources': [ '<@(mips_dsp_sources)' ],
- }, { # mips_dsp_rev == 0
- 'sources': [ '<@(none_sources)' ],
- }],
- ],
- }],
- [ 'target_arch == "mips64el"',{
- 'cflags': [ '-fomit-frame-pointer' ],
- 'sources': [ '<@(none_sources)' ],
- }],
- [ 'target_arch == "arm64"', {
- 'sources': [ '<@(arm64_sources)' ],
- }],
- ],
- },
- # For the same lame reasons as what is done for skia_opts, we have to
- # create another target specifically for SSSE3 code as we would not want
- # to compile the SSE2 code with -mssse3 which would potentially allow
- # gcc to generate SSSE3 code.
- {
- 'target_name': 'skia_opts_ssse3',
- 'type': 'static_library',
- # The optimize: 'max' scattered throughout are particularly
- # important when compiled by MSVC 2013, which seems
- # to mis-link-time-compile code that's built with
- # different optimization levels. http://crbug.com/543583
- 'variables': {
- 'optimize': 'max',
- },
- 'includes': [
- 'skia_common.gypi',
- ],
- 'include_dirs': [ '<@(include_dirs)' ],
- 'conditions': [
- [ 'OS in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
- 'cflags': [ '-mssse3' ],
- }],
- [ 'OS == "mac"', {
- 'xcode_settings': {
- 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES',
- },
- }],
- [ 'OS == "win" and clang == 1', {
- # cl.exe's /arch flag doesn't have a setting for SSSE3, and cl.exe
- # doesn't need it for intrinsics. clang-cl does need it, though.
- 'msvs_settings': {
- 'VCCLCompilerTool': { 'AdditionalOptions': [ '-mssse3' ] },
- },
- }],
- [ 'OS == "win"', {
- 'defines' : [ 'SK_CPU_SSE_LEVEL=31' ],
- }],
- [ 'target_arch != "arm" and target_arch != "arm64" and \
- target_arch != "mipsel" and target_arch != "mips64el"', {
- 'sources': [ '<@(ssse3_sources)' ],
- }],
- ],
- },
- # For the same lame reasons as what is done for skia_opts, we also have to
- # create another target specifically for SSE4.1 code as we would not want
- # to compile the SSE2 code with -msse4.1 which would potentially allow
- # gcc to generate SSE4.1 code.
- {
- 'target_name': 'skia_opts_sse41',
- 'type': 'static_library',
- # The optimize: 'max' scattered throughout are particularly
- # important when compiled by MSVC 2013, which seems
- # to mis-link-time-compile code that's built with
- # different optimization levels. http://crbug.com/543583
- 'variables': {
- 'optimize': 'max',
- },
- 'includes': [
- 'skia_common.gypi',
- ],
- 'include_dirs': [ '<@(include_dirs)' ],
- 'sources': [ '<@(sse41_sources)' ],
- 'conditions': [
- [ 'OS in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
- 'cflags': [ '-msse4.1' ],
- }],
- [ 'OS == "mac"', {
- 'xcode_settings': {
- 'GCC_ENABLE_SSE41_EXTENSIONS': 'YES',
- },
- }],
- [ 'OS == "win" and clang == 1', {
- # cl.exe's /arch flag doesn't have a setting for SSE4.1, and cl.exe
- # doesn't need it for intrinsics. clang-cl does need it, though.
- 'msvs_settings': {
- 'VCCLCompilerTool': { 'AdditionalOptions': [ '-msse4.1' ] },
- },
- }],
- [ 'OS == "win"', {
- 'defines' : [ 'SK_CPU_SSE_LEVEL=41' ],
- }],
- ],
- },
- {
- 'target_name': 'skia_opts_sse42',
- 'type': 'static_library',
- # The optimize: 'max' scattered throughout are particularly
- # important when compiled by MSVC 2013, which seems
- # to mis-link-time-compile code that's built with
- # different optimization levels. http://crbug.com/543583
- 'variables': {
- 'optimize': 'max',
- },
- 'includes': [
- 'skia_common.gypi',
- ],
- 'include_dirs': [ '<@(include_dirs)' ],
- 'sources': [ '<@(sse42_sources)' ],
- 'conditions': [
- [ 'OS in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
- 'cflags': [ '-msse4.2' ],
- }],
- [ 'OS == "mac"', {
- 'xcode_settings': {
- 'GCC_ENABLE_SSE42_EXTENSIONS': 'YES',
- },
- }],
- [ 'OS == "win" and clang == 1', {
- # cl.exe's /arch flag doesn't have a setting for SSE4.2, and cl.exe
- # doesn't need it for intrinsics. clang-cl does need it, though.
- 'msvs_settings': {
- 'VCCLCompilerTool': { 'AdditionalOptions': [ '-msse4.2' ] },
- },
- }],
- [ 'OS == "win"', {
- 'defines' : [ 'SK_CPU_SSE_LEVEL=42' ],
- }],
- ],
- },
- {
- 'target_name': 'skia_opts_avx',
- 'type': 'static_library',
- # The optimize: 'max' scattered throughout are particularly
- # important when compiled by MSVC 2013, which seems
- # to mis-link-time-compile code that's built with
- # different optimization levels. http://crbug.com/543583
- 'variables': {
- 'optimize': 'max',
- },
- 'includes': [
- 'skia_common.gypi',
- ],
- 'include_dirs': [ '<@(include_dirs)' ],
- 'sources': [ '<@(avx_sources)' ],
- 'conditions': [
- [ 'OS in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
- 'cflags': [ '-mavx' ],
- }],
- [ 'OS == "mac"', {
- 'xcode_settings': {
- 'OTHER_CFLAGS': [ '-mavx' ],
- },
- }],
- [ 'OS == "win"', {
- 'msvs_settings': { 'VCCLCompilerTool': { 'EnableEnhancedInstructionSet': '3' } },
- }],
- ],
- },
- {
- 'target_name': 'skia_opts_avx2',
- 'type': 'static_library',
- # The optimize: 'max' scattered throughout are particularly
- # important when compiled by MSVC 2013, which seems
- # to mis-link-time-compile code that's built with
- # different optimization levels. http://crbug.com/543583
- 'variables': {
- 'optimize': 'max',
- },
- 'includes': [
- 'skia_common.gypi',
- ],
- 'include_dirs': [ '<@(include_dirs)' ],
- 'sources': [ '<@(avx2_sources)' ],
- 'conditions': [
- [ 'OS in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
- 'cflags': [ '-mavx2' ],
- }],
- [ 'OS == "mac"', {
- 'xcode_settings': {
- 'OTHER_CFLAGS': [ '-mavx2' ],
- },
- }],
- [ 'OS == "win"', {
- 'msvs_settings': { 'VCCLCompilerTool': { 'EnableEnhancedInstructionSet': '5' } },
- }],
- ],
- },
- {
- 'target_name': 'skia_opts_none',
- 'type': 'static_library',
- # The optimize: 'max' scattered throughout are particularly
- # important when compiled by MSVC 2013, which seems
- # to mis-link-time-compile code that's built with
- # different optimization levels. http://crbug.com/543583
- 'variables': {
- 'optimize': 'max',
- },
- 'includes': [
- 'skia_common.gypi',
- ],
- 'include_dirs': [ '<@(include_dirs)' ],
- 'sources': [ '<@(none_sources)' ],
- },
- ],
- 'conditions': [
- # NEON code must be compiled with -mfpu=neon which also affects scalar
- # code. To support dynamic NEON code paths, we need to build all
- # NEON-specific sources in a separate static library. The situation
- # is very similar to the SSSE3 one.
- ['target_arch == "arm" and (arm_neon == 1 or arm_neon_optional == 1)', {
- 'targets': [
- {
- 'target_name': 'skia_opts_neon',
- 'type': 'static_library',
- 'includes': [
- 'skia_common.gypi',
- ],
- 'include_dirs': [ '<@(include_dirs)' ],
- 'cflags!': [
- '-fno-omit-frame-pointer',
- '-mfpu=vfp', # remove them all, just in case.
- '-mfpu=vfpv3',
- '-mfpu=vfpv3-d16',
- ],
- 'cflags': [
- '-mfpu=neon',
- '-fomit-frame-pointer',
- ],
- 'ldflags': [
- '-march=armv7-a',
- '-Wl,--fix-cortex-a8',
- ],
- 'sources': [ '<@(neon_sources)' ],
- },
- ],
- }],
- ],
-}
« no previous file with comments | « skia/skia_library.gypi ('k') | skia/skia_pdfium.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698