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

Side by Side Diff: third_party/WebKit/Source/web/web.gyp

Issue 1858273002: Fix compile flake in gyp builds inside Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « third_party/WebKit/Source/platform/blink_platform.gyp ('k') | no next file » | 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) 2011 Google Inc. All rights reserved. 2 # Copyright (C) 2011 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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 ['OS=="android"', { 165 ['OS=="android"', {
166 'sources/': [ 166 'sources/': [
167 ['include', '^linux/WebFontRendering\\.cpp$'], 167 ['include', '^linux/WebFontRendering\\.cpp$'],
168 ], 168 ],
169 }], 169 }],
170 ], 170 ],
171 }, 171 },
172 { 172 {
173 # GN version: //third_party/WebKit/Source/web:test_support 173 # GN version: //third_party/WebKit/Source/web:test_support
174 'target_name': 'blink_web_test_support', 174 'target_name': 'blink_web_test_support',
175 # Because of transitive dependency on make_platform_generated.
176 'hard_dependency': 1,
175 'type': 'static_library', 177 'type': 'static_library',
176 'dependencies': [ 178 'dependencies': [
177 '../config.gyp:config', 179 '../config.gyp:config',
178 '../core/core.gyp:webcore_testing', 180 '../core/core.gyp:webcore_testing',
179 '../modules/modules.gyp:modules_testing', 181 '../modules/modules.gyp:modules_testing',
180 '../wtf/wtf.gyp:wtf', 182 '../wtf/wtf.gyp:wtf',
181 '<(DEPTH)/skia/skia.gyp:skia', 183 '<(DEPTH)/skia/skia.gyp:skia',
182 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 184 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
183 ], 185 ],
184 'include_dirs': [ 186 'include_dirs': [
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 'dependencies': ['<(DEPTH)/third_party/mesa/mesa.gyp:osmesa' ], 231 'dependencies': ['<(DEPTH)/third_party/mesa/mesa.gyp:osmesa' ],
230 'copies': [{ 232 'copies': [{
231 'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Conten ts/MacOS/', 233 'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Conten ts/MacOS/',
232 'files': ['<(PRODUCT_DIR)/osmesa.so'], 234 'files': ['<(PRODUCT_DIR)/osmesa.so'],
233 }], 235 }],
234 }, 236 },
235 ], 237 ],
236 }], 238 }],
237 ], # conditions 239 ], # conditions
238 } 240 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/blink_platform.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698