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

Side by Side Diff: content/content.gyp

Issue 894103002: Fix flaky mac build due to missing permission_status.mojom.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add the mojom dependencies to content_browser instead Created 5 years, 10 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 | 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 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine. 8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine.
9 'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)' , 9 'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)' ,
10 }, 10 },
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 'type': 'static_library', 148 'type': 'static_library',
149 'variables': { 'enable_wexit_time_destructors': 1, }, 149 'variables': { 'enable_wexit_time_destructors': 1, },
150 'includes': [ 150 'includes': [
151 'content_browser.gypi', 151 'content_browser.gypi',
152 # Disable LTO due to ELF section name out of range 152 # Disable LTO due to ELF section name out of range
153 # crbug.com/422251 153 # crbug.com/422251
154 '../build/android/disable_lto.gypi', 154 '../build/android/disable_lto.gypi',
155 ], 155 ],
156 'dependencies': [ 156 'dependencies': [
157 'content_common', 157 'content_common',
158 'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
blundell 2015/02/03 13:02:02 Oops, sorry for the misunderstanding. content.gyp:
158 ], 159 ],
159 'export_dependent_settings': [ 160 'export_dependent_settings': [
160 'content_common', 161 'content_common',
162 'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
161 ], 163 ],
162 'conditions': [ 164 'conditions': [
163 ['java_bridge==1', { 165 ['java_bridge==1', {
164 'dependencies': [ 166 'dependencies': [
165 'content_child', 167 'content_child',
166 ] 168 ]
167 }], 169 }],
168 ['OS=="android"', { 170 ['OS=="android"', {
169 'dependencies': [ 171 'dependencies': [
170 'content_gpu', 172 'content_gpu',
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 ], 601 ],
600 }, 602 },
601 ], 603 ],
602 }], 604 }],
603 ], 605 ],
604 }, 606 },
605 ], 607 ],
606 }], # OS == "android" 608 }], # OS == "android"
607 ], 609 ],
608 } 610 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698