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

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

Issue 65303006: Move TimingFunction.h to platform/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: gyp changes 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 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 '../wtf/wtf.gyp:wtf', 64 '../wtf/wtf.gyp:wtf',
65 '<(DEPTH)/skia/skia.gyp:skia', 65 '<(DEPTH)/skia/skia.gyp:skia',
66 # FIXME: This dependency exists for CSS Custom Filters, via the file ANGLE PlatformBridge 66 # FIXME: This dependency exists for CSS Custom Filters, via the file ANGLE PlatformBridge
67 # The code touching ANGLE should really be moved into the ANGLE directory. 67 # The code touching ANGLE should really be moved into the ANGLE directory.
68 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator', 68 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator',
69 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 69 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
70 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 70 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
71 '<(DEPTH)/url/url.gyp:url_lib', 71 '<(DEPTH)/url/url.gyp:url_lib',
72 'platform_derived_sources.gyp:make_platform_derived_sources', 72 'platform_derived_sources.gyp:make_platform_derived_sources',
73 'blink_common', 73 'blink_common',
74 'blink_platform_tests.gyp:blink_platform_unittests_support',
abarth-chromium 2013/12/04 05:45:26 This is a strange dependency. blink_platform is a
74 ], 75 ],
75 'export_dependent_settings': [ 76 'export_dependent_settings': [
76 # FIXME: This dependency exists for CSS Custom Filters, via the file ANGLE PlatformBridge 77 # 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 # The code touching ANGLE should really be moved into the ANGLE directory.
78 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator', 79 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator',
79 '<(DEPTH)/url/url.gyp:url_lib', 80 '<(DEPTH)/url/url.gyp:url_lib',
80 ], 81 ],
81 'defines': [ 82 'defines': [
82 'BLINK_PLATFORM_IMPLEMENTATION=1', 83 'BLINK_PLATFORM_IMPLEMENTATION=1',
83 'INSIDE_BLINK', 84 'INSIDE_BLINK',
84 ], 85 ],
85 'include_dirs': [ 86 'include_dirs': [
86 '<(DEPTH)/third_party/angle_dx11/include', 87 '<(DEPTH)/third_party/angle_dx11/include',
87 '<(SHARED_INTERMEDIATE_DIR)/blink', 88 '<(SHARED_INTERMEDIATE_DIR)/blink',
88 ], 89 ],
89 'xcode_settings': { 90 'xcode_settings': {
90 # Some Mac-specific parts of WebKit won't compile without having this 91 # Some Mac-specific parts of WebKit won't compile without having this
91 # prefix header injected. 92 # prefix header injected.
92 # FIXME: make this a first-class setting. 93 # FIXME: make this a first-class setting.
93 'GCC_PREFIX_HEADER': '../core/WebCorePrefixMac.h', 94 'GCC_PREFIX_HEADER': '../core/WebCorePrefixMac.h',
94 }, 95 },
95 'sources': [ 96 'sources': [
96 '<@(platform_files)', 97 '<@(platform_files)',
97 98
98 # Additional .cpp files from platform_derived_sources.gyp:make_platform_de rived_sources actions. 99 # Additional .cpp files from platform_derived_sources.gyp:make_platform_de rived_sources actions.
99 '<(SHARED_INTERMEDIATE_DIR)/blink/FontFamilyNames.cpp', 100 '<(SHARED_INTERMEDIATE_DIR)/blink/FontFamilyNames.cpp',
100 '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.cpp',
101 '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.h',
102 '<(SHARED_INTERMEDIATE_DIR)/blink/ColorData.cpp', 101 '<(SHARED_INTERMEDIATE_DIR)/blink/ColorData.cpp',
103 ], 102 ],
104 # Disable c4267 warnings until we fix size_t to int truncations. 103 # Disable c4267 warnings until we fix size_t to int truncations.
105 # Disable c4724 warnings which is generated in VS2012 due to improper 104 # Disable c4724 warnings which is generated in VS2012 due to improper
106 # compiler optimizations, see crbug.com/237063 105 # compiler optimizations, see crbug.com/237063
107 'msvs_disabled_warnings': [ 4267, 4334, 4724 ], 106 'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
108 'conditions': [ 107 'conditions': [
109 ['OS=="mac"', { 108 ['OS=="mac"', {
110 'link_settings': { 109 'link_settings': {
111 'libraries': [ 110 'libraries': [
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 'include_dirs': [ 168 'include_dirs': [
170 '<(DEPTH)/third_party/openmax_dl', 169 '<(DEPTH)/third_party/openmax_dl',
171 ], 170 ],
172 'dependencies': [ 171 'dependencies': [
173 '<(DEPTH)/third_party/openmax_dl/dl/dl.gyp:openmax_dl', 172 '<(DEPTH)/third_party/openmax_dl/dl/dl.gyp:openmax_dl',
174 ], 173 ],
175 }], 174 }],
176 ], 175 ],
177 }], 176 }],
178 } 177 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698