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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: skia/skia_library_opts.gyp

Issue 389343005: Roll Skia to f459c85457c (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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
« skia/BUILD.gn ('K') | « skia/BUILD.gn ('k') | no next file » | 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
index 948db08d9fee2d299b199d45a6eabb0542ef1078..e8ee9048696eb19694a688f6542da5d5cc9046e3 100644
--- a/skia/skia_library_opts.gyp
+++ b/skia/skia_library_opts.gyp
@@ -35,6 +35,7 @@
'../third_party/skia/include/effects',
'../third_party/skia/src/core',
'../third_party/skia/src/opts',
+ '../third_party/skia/src/utils',
],
'conditions': [
[ 'os_posix == 1 and OS != "mac" and OS != "android" and \
@@ -47,14 +48,15 @@
[ 'target_arch != "arm" and target_arch != "mipsel" and \
target_arch != "arm64"', {
'sources': [
+ '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp',
+ '../third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp',
+ '../third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp',
+ '../third_party/skia/src/opts/SkTextureCompression_opts_none.cpp',
'../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp',
'../third_party/skia/src/opts/SkXfermode_opts_SSE2.cpp',
- '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp',
- '../third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp',
- '../third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp',
],
'dependencies': [
'skia_opts_ssse3',
@@ -100,6 +102,7 @@
],
'sources': [
'../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
+ '../third_party/skia/src/opts/SkTextureCompression_opts_arm.cpp',
],
}],
[ 'target_arch == "arm" and (arm_version < 7 or (arm_neon == 0 and arm_neon_optional == 1))', {
@@ -136,10 +139,11 @@
'../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
'../third_party/skia/src/opts/SkBlitMask_opts_none.cpp',
'../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
+ '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
+ '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
+ '../third_party/skia/src/opts/SkTextureCompression_opts_none.cpp',
'../third_party/skia/src/opts/SkUtils_opts_none.cpp',
'../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
- '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
- '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
],
}],
[ 'target_arch == "arm64"', {
@@ -154,6 +158,7 @@
'../third_party/skia/src/opts/SkBlurImage_opts_neon.cpp',
'../third_party/skia/src/opts/SkMorphology_opts_arm.cpp',
'../third_party/skia/src/opts/SkMorphology_opts_neon.cpp',
+ '../third_party/skia/src/opts/SkTextureCompression_opts_arm.cpp',
'../third_party/skia/src/opts/SkUtils_opts_none.cpp',
'../third_party/skia/src/opts/SkXfermode_opts_arm.cpp',
'../third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp',
@@ -260,10 +265,11 @@
'../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
'../third_party/skia/src/opts/SkBlitMask_opts_none.cpp',
'../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
+ '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
+ '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
+ '../third_party/skia/src/opts/SkTextureCompression_opts_none.cpp',
'../third_party/skia/src/opts/SkUtils_opts_none.cpp',
'../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
- '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
- '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
],
},
],
@@ -301,17 +307,18 @@
'-Wl,--fix-cortex-a8',
],
'sources': [
- '../third_party/skia/src/opts/memset16_neon.S',
- '../third_party/skia/src/opts/memset32_neon.S',
'../third_party/skia/src/opts/SkBitmapProcState_arm_neon.cpp',
'../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
'../third_party/skia/src/opts/SkBitmapProcState_matrix_clamp_neon.h',
'../third_party/skia/src/opts/SkBitmapProcState_matrix_repeat_neon.h',
'../third_party/skia/src/opts/SkBlitMask_opts_arm_neon.cpp',
'../third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp',
- '../third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp',
'../third_party/skia/src/opts/SkBlurImage_opts_neon.cpp',
'../third_party/skia/src/opts/SkMorphology_opts_neon.cpp',
+ '../third_party/skia/src/opts/SkTextureCompression_opts_neon.cpp',
+ '../third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp',
+ '../third_party/skia/src/opts/memset16_neon.S',
+ '../third_party/skia/src/opts/memset32_neon.S',
],
'conditions': [
['arm_neon == 1', {
« skia/BUILD.gn ('K') | « skia/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698