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

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

Issue 26763006: Move the generation and inclusion of RuntimeEnabledFeatures to blink_platform.dll since many pieces… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Trying again Created 7 years, 1 month 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
« no previous file with comments | « Source/platform/RuntimeEnabledFeatures.in ('k') | Source/platform/platform_derived_sources.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 11 matching lines...) Expand all
22 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 # 29 #
30 { 30 {
31 'includes': [ 31 'includes': [
32 '../build/features.gypi',
33 '../build/scripts/scripts.gypi',
32 '../build/win/precompile.gypi', 34 '../build/win/precompile.gypi',
33 '../build/features.gypi',
34 'blink_platform.gypi', 35 'blink_platform.gypi',
35 ], 36 ],
36 'targets': [{ 37 'targets': [{
37 'target_name': 'blink_common', 38 'target_name': 'blink_common',
38 'type': '<(component)', 39 'type': '<(component)',
39 'variables': { 'enable_wexit_time_destructors': 1 }, 40 'variables': { 'enable_wexit_time_destructors': 1 },
40 'dependencies': [ 41 'dependencies': [
41 '../config.gyp:config', 42 '../config.gyp:config',
42 '../wtf/wtf.gyp:wtf', 43 '../wtf/wtf.gyp:wtf',
43 # FIXME: Can we remove the dependencies on V8 and Skia? 44 # FIXME: Can we remove the dependencies on V8 and Skia?
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 'INSIDE_BLINK', 85 'INSIDE_BLINK',
85 ], 86 ],
86 'include_dirs': [ 87 'include_dirs': [
87 '<(DEPTH)/third_party/angle_dx11/include', 88 '<(DEPTH)/third_party/angle_dx11/include',
88 ], 89 ],
89 'sources': [ 90 'sources': [
90 '<@(platform_files)', 91 '<@(platform_files)',
91 92
92 # Additional .cpp files from platform_derived_sources.gyp:make_platform_de rived_sources actions. 93 # Additional .cpp files from platform_derived_sources.gyp:make_platform_de rived_sources actions.
93 '<(SHARED_INTERMEDIATE_DIR)/blink/FontFamilyNames.cpp', 94 '<(SHARED_INTERMEDIATE_DIR)/blink/FontFamilyNames.cpp',
95 '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.cpp',
96 '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.h',
94 ], 97 ],
95 # Disable c4267 warnings until we fix size_t to int truncations. 98 # Disable c4267 warnings until we fix size_t to int truncations.
96 # Disable c4724 warnings which is generated in VS2012 due to improper 99 # Disable c4724 warnings which is generated in VS2012 due to improper
97 # compiler optimizations, see crbug.com/237063 100 # compiler optimizations, see crbug.com/237063
98 'msvs_disabled_warnings': [ 4267, 4334, 4724 ], 101 'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
99 'conditions': [ 102 'conditions': [
100 ['OS=="mac"', { 103 ['OS=="mac"', {
101 'link_settings': { 104 'link_settings': {
102 'libraries': [ 105 'libraries': [
103 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', 106 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 'include_dirs': [ 140 'include_dirs': [
138 '<(DEPTH)/third_party/openmax_dl', 141 '<(DEPTH)/third_party/openmax_dl',
139 ], 142 ],
140 'dependencies': [ 143 'dependencies': [
141 '<(DEPTH)/third_party/openmax_dl/dl/dl.gyp:openmax_dl', 144 '<(DEPTH)/third_party/openmax_dl/dl/dl.gyp:openmax_dl',
142 ], 145 ],
143 }], 146 }],
144 ], 147 ],
145 }], 148 }],
146 } 149 }
OLDNEW
« no previous file with comments | « Source/platform/RuntimeEnabledFeatures.in ('k') | Source/platform/platform_derived_sources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698