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

Side by Side Diff: third_party/WebKit/Source/platform/blink_platform.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 | « no previous file | third_party/WebKit/Source/web/web.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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 ], 116 ],
117 'yasm_flags': [ 117 'yasm_flags': [
118 '>@(more_yasm_flags)', 118 '>@(more_yasm_flags)',
119 ], 119 ],
120 'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/webcore/heap' 120 'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/webcore/heap'
121 }, 121 },
122 }, 122 },
123 { 123 {
124 'target_name': 'blink_platform', 124 'target_name': 'blink_platform',
125 'type': '<(component)', 125 'type': '<(component)',
126 # Because of transitive dependency on make_platform_generated.
127 'hard_dependency': 1,
126 'dependencies': [ 128 'dependencies': [
127 '../config.gyp:config', 129 '../config.gyp:config',
128 '../wtf/wtf.gyp:wtf', 130 '../wtf/wtf.gyp:wtf',
129 'blink_common', 131 'blink_common',
130 'blink_heap_asm_stubs', 132 'blink_heap_asm_stubs',
131 'platform_generated.gyp:make_platform_generated', 133 'platform_generated.gyp:make_platform_generated',
132 '<(DEPTH)/base/base.gyp:base', 134 '<(DEPTH)/base/base.gyp:base',
133 '<(DEPTH)/cc/cc.gyp:cc', 135 '<(DEPTH)/cc/cc.gyp:cc',
134 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 136 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
135 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', 137 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 ['OS=="android"', { 411 ['OS=="android"', {
410 'cflags!': ['-mthumb'], 412 'cflags!': ['-mthumb'],
411 }], 413 }],
412 ], 414 ],
413 },{ # target_arch!="arm" 415 },{ # target_arch!="arm"
414 'type': 'none', 416 'type': 'none',
415 }], 417 }],
416 ], 418 ],
417 }], 419 }],
418 } 420 }
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/web.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698