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

Side by Side Diff: Source/platform/blink_platform.gyp

Issue 25825003: Move ANGLEWebKitBridge to platform/graphics/angle/ANGLEPlatformBridge. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed bad merge Created 7 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # 1 #
2 # Copyright (C) 2013 Google Inc. All rights reserved. 2 # Copyright (C) 2013 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 'exported/WebCommon.cpp', 57 'exported/WebCommon.cpp',
58 ], 58 ],
59 }, { 59 }, {
60 'target_name': 'blink_platform', 60 'target_name': 'blink_platform',
61 'type': '<(component)', 61 'type': '<(component)',
62 'dependencies': [ 62 'dependencies': [
63 '../config.gyp:config', 63 '../config.gyp:config',
64 '../wtf/wtf.gyp:wtf', 64 '../wtf/wtf.gyp:wtf',
65 '../weborigin/weborigin.gyp:weborigin', 65 '../weborigin/weborigin.gyp:weborigin',
66 '<(DEPTH)/skia/skia.gyp:skia', 66 '<(DEPTH)/skia/skia.gyp:skia',
67 # FIXME: This dependency exists for CSS Custom Filters, via the file ANGLE PlatformBridge
68 # The code touching ANGLE should really be moved into the ANGLE directory.
69 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator',
67 '<(DEPTH)/url/url.gyp:url_lib', 70 '<(DEPTH)/url/url.gyp:url_lib',
68 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 71 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
69 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 72 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
70 'blink_common', 73 'blink_common',
71 ], 74 ],
75 'export_dependent_settings': [
76 # FIXME: This dependency exists for CSS Custom Filters, via the file ANGLE PlatformBridge
77 # The code touching ANGLE should really be moved into the ANGLE directory.
78 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator',
79 ],
72 'defines': [ 80 'defines': [
73 'BLINK_PLATFORM_IMPLEMENTATION=1', 81 'BLINK_PLATFORM_IMPLEMENTATION=1',
74 'INSIDE_BLINK', 82 'INSIDE_BLINK',
75 ], 83 ],
84 'include_dirs': [
85 '<(DEPTH)/third_party/angle_dx11/include',
86 ],
76 'sources': [ 87 'sources': [
77 '<@(platform_files)', 88 '<@(platform_files)',
78 ], 89 ],
79 'conditions': [ 90 'conditions': [
80 ['OS=="win"', { 91 ['OS=="win"', {
81 'sources/': [ 92 'sources/': [
82 ['exclude', 'Posix\\.cpp$'], 93 ['exclude', 'Posix\\.cpp$'],
83 ], 94 ],
84 }, { # OS!="win" 95 }, { # OS!="win"
85 'sources/': [ 96 'sources/': [
86 ['exclude', 'Win\\.cpp$'], 97 ['exclude', 'Win\\.cpp$'],
87 ], 98 ],
88 }], 99 }],
89 ], 100 ],
90 }], 101 }],
91 } 102 }
OLDNEW
« no previous file with comments | « Source/core/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698