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

Unified Diff: Source/platform/blink_platform.gyp

Issue 107713004: Move all filters-related files from core/platform to platform. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Maybe fix win build. Created 7 years 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 | « Source/core/svg/graphics/filters/SVGFilterBuilder.cpp ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/blink_platform.gyp
diff --git a/Source/platform/blink_platform.gyp b/Source/platform/blink_platform.gyp
index c209b90c8566edb268473ce2ad02110b65f67424..7fa9fc6ff4a9f40faa9af808b806ca63bb63cf8e 100644
--- a/Source/platform/blink_platform.gyp
+++ b/Source/platform/blink_platform.gyp
@@ -367,6 +367,11 @@
'<(DEPTH)/third_party/openmax_dl/dl/dl.gyp:openmax_dl',
],
}],
+ ['target_arch=="arm"', {
+ 'dependencies': [
+ 'blink_arm_neon',
+ ],
+ }],
],
'target_conditions': [
['OS=="android"', {
@@ -375,5 +380,35 @@
],
}],
],
+ },
+ # The *NEON.cpp files fail to compile when -mthumb is passed. Force
+ # them to build in ARM mode.
+ # See https://bugs.webkit.org/show_bug.cgi?id=62916.
+ {
+ 'target_name': 'blink_arm_neon',
+ 'conditions': [
+ ['target_arch=="arm"', {
+ 'type': 'static_library',
+ 'dependencies': [
+ 'blink_common',
+ ],
+ 'hard_dependency': 1,
+ 'sources': [
+ '<@(platform_files)',
+ ],
+ 'sources/': [
+ ['exclude', '.*'],
+ ['include', 'graphics/cpu/arm/filters/.*NEON\\.(cpp|h)'],
+ ],
+ 'cflags': ['-marm'],
+ 'conditions': [
+ ['OS=="android"', {
+ 'cflags!': ['-mthumb'],
+ }],
+ ],
+ },{ # target_arch!="arm"
+ 'type': 'none',
+ }],
+ ],
}],
}
« no previous file with comments | « Source/core/svg/graphics/filters/SVGFilterBuilder.cpp ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698