diff options
Diffstat (limited to 'chromium/third_party/skia/gyp/opts.gyp')
| -rw-r--r-- | chromium/third_party/skia/gyp/opts.gyp | 81 |
1 files changed, 70 insertions, 11 deletions
diff --git a/chromium/third_party/skia/gyp/opts.gyp b/chromium/third_party/skia/gyp/opts.gyp index bd072cb1e8e..69e3946c349 100644 --- a/chromium/third_party/skia/gyp/opts.gyp +++ b/chromium/third_party/skia/gyp/opts.gyp @@ -1,3 +1,4 @@ +# Gyp file for opts projects { 'targets': [ # Due to an unfortunate intersection of lameness between gcc and gyp, @@ -25,6 +26,7 @@ 'standalone_static_library': 1, 'dependencies': [ 'core.gyp:*', + 'effects.gyp:*' ], 'include_dirs': [ '../src/core', @@ -46,7 +48,7 @@ 'opts_ssse3', ], 'sources': [ - '../src/opts/opts_check_SSE2.cpp', + '../src/opts/opts_check_x86.cpp', '../src/opts/SkBitmapProcState_opts_SSE2.cpp', '../src/opts/SkBitmapFilter_opts_SSE2.cpp', '../src/opts/SkBlitRow_opts_SSE2.cpp', @@ -54,7 +56,7 @@ '../src/opts/SkBlurImage_opts_SSE2.cpp', '../src/opts/SkMorphology_opts_SSE2.cpp', '../src/opts/SkUtils_opts_SSE2.cpp', - '../src/opts/SkXfermode_opts_none.cpp', + '../src/opts/SkXfermode_opts_SSE2.cpp', ], }], [ 'skia_arch_type == "arm" and arm_version >= 7', { @@ -73,12 +75,13 @@ 'arm_neon_optional%': '<(arm_neon_optional>', }, 'sources': [ - '../src/opts/opts_check_arm.cpp', '../src/opts/memset.arm.S', '../src/opts/SkBitmapProcState_opts_arm.cpp', '../src/opts/SkBlitMask_opts_arm.cpp', '../src/opts/SkBlitRow_opts_arm.cpp', - '../src/opts/SkBlitRow_opts_arm.h', + '../src/opts/SkBlurImage_opts_arm.cpp', + '../src/opts/SkMorphology_opts_arm.cpp', + '../src/opts/SkUtils_opts_arm.cpp', '../src/opts/SkXfermode_opts_arm.cpp', ], 'conditions': [ @@ -97,7 +100,31 @@ }], ], }], - [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) or (skia_os == "ios")', { + [ 'skia_arch_type == "mips"', { + 'sources': [ + '../src/opts/SkBitmapProcState_opts_none.cpp', + '../src/opts/SkBlitMask_opts_none.cpp', + '../src/opts/SkBlurImage_opts_none.cpp', + '../src/opts/SkMorphology_opts_none.cpp', + '../src/opts/SkUtils_opts_none.cpp', + '../src/opts/SkXfermode_opts_none.cpp', + ], + 'conditions': [ + [ '(mips_arch_variant == "mips32r2") \ + and (mips_dsp == 1 or mips_dsp == 2)', { + 'sources': [ + '../src/opts/SkBlitRow_opts_mips_dsp.cpp', + ], + }, { + 'sources': [ + '../src/opts/SkBlitRow_opts_none.cpp', + ], + }], + ], + }], + [ '(skia_arch_type == "arm" and arm_version < 7) \ + or (skia_os == "ios") \ + or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"])', { 'sources': [ '../src/opts/SkBitmapProcState_opts_none.cpp', '../src/opts/SkBlitMask_opts_none.cpp', @@ -108,6 +135,32 @@ '../src/opts/SkXfermode_opts_none.cpp', ], }], + [ 'skia_android_framework', { + 'cflags!': [ + '-msse2', + '-mfpu=neon', + '-fomit-frame-pointer', + '-mno-apcs-frame', + ] + }], + [ 'skia_arch_type == "arm64"', { + 'sources': [ + '../src/opts/SkBitmapProcState_arm_neon.cpp', + '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp', + '../src/opts/SkBitmapProcState_opts_arm.cpp', + '../src/opts/SkBlitMask_opts_arm.cpp', + '../src/opts/SkBlitMask_opts_arm_neon.cpp', + '../src/opts/SkBlitRow_opts_arm.cpp', + '../src/opts/SkBlitRow_opts_arm_neon.cpp', + '../src/opts/SkBlurImage_opts_arm.cpp', + '../src/opts/SkBlurImage_opts_neon.cpp', + '../src/opts/SkMorphology_opts_arm.cpp', + '../src/opts/SkMorphology_opts_neon.cpp', + '../src/opts/SkUtils_opts_none.cpp', + '../src/opts/SkXfermode_opts_arm.cpp', + '../src/opts/SkXfermode_opts_arm_neon.cpp', + ], + }], ], }, # For the same lame reasons as what is done for skia_opts, we have to @@ -121,12 +174,14 @@ 'standalone_static_library': 1, 'dependencies': [ 'core.gyp:*', + 'effects.gyp:*' ], 'include_dirs': [ '../src/core', ], 'conditions': [ - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"] \ + and not skia_android_framework', { 'cflags': [ '-mssse3', ], @@ -150,6 +205,7 @@ 'standalone_static_library': 1, 'dependencies': [ 'core.gyp:*', + 'effects.gyp:*' ], 'include_dirs': [ '../src/core', @@ -161,9 +217,13 @@ '-mfpu=vfpv3', '-mfpu=vfpv3-d16', ], - 'cflags': [ - '-mfpu=neon', - '-fomit-frame-pointer', + 'conditions': [ + [ 'not skia_android_framework', { + 'cflags': [ + '-mfpu=neon', + '-fomit-frame-pointer', + ], + }], ], 'ldflags': [ '-march=armv7-a', @@ -174,8 +234,7 @@ '../src/opts/memset32_neon.S', '../src/opts/SkBitmapProcState_arm_neon.cpp', '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp', - '../src/opts/SkBitmapProcState_matrix_clamp_neon.h', - '../src/opts/SkBitmapProcState_matrix_repeat_neon.h', + '../src/opts/SkBitmapProcState_matrix_neon.h', '../src/opts/SkBlitMask_opts_arm_neon.cpp', '../src/opts/SkBlitRow_opts_arm_neon.cpp', '../src/opts/SkBlurImage_opts_neon.cpp', |