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

Side by Side Diff: webkit/glue/webkit_glue.gypi

Issue 10451068: Fixing gcc 4.7 building problems. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Reverted patch from pastebin and modified according to James' comments Created 8 years, 6 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
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 'conditions': [ 7 'conditions': [
8 ['inside_chromium_build==0', { 8 ['inside_chromium_build==0', {
9 'webkit_src_dir': '../../../../..', 9 'webkit_src_dir': '../../../../..',
10 },{ 10 },{
11 'webkit_src_dir': '../../third_party/WebKit', 11 'webkit_src_dir': '../../third_party/WebKit',
12 }], 12 }],
13 ], 13 ],
14 }, 14 },
15 'target_defaults': {
16 # Disable narrowing-conversion-in-initialization-list warnings in that we
17 # do not want to fix it in data file "webcursor_gtk_data.h".
18 'cflags+': ['-Wno-narrowing'],
19 'cflags_cc+': ['-Wno-narrowing'],
20 },
15 'targets': [ 21 'targets': [
16 { 22 {
17 'target_name': 'webkit_resources', 23 'target_name': 'webkit_resources',
18 'type': 'none', 24 'type': 'none',
19 'variables': { 25 'variables': {
20 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', 26 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
21 }, 27 },
22 'actions': [ 28 'actions': [
23 { 29 {
24 'action_name': 'webkit_resources', 30 'action_name': 'webkit_resources',
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 }, 569 },
564 'includes': [ '../../build/grit_action.gypi' ], 570 'includes': [ '../../build/grit_action.gypi' ],
565 }, 571 },
566 ], 572 ],
567 'includes': [ '../../build/grit_target.gypi' ], 573 'includes': [ '../../build/grit_target.gypi' ],
568 }, 574 },
569 ], 575 ],
570 }], 576 }],
571 ], 577 ],
572 } 578 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698