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

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

Issue 11066132: Remove use_libcc_for_compositor gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « webkit/compositor_bindings/web_compositor_support_impl.cc ('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 # 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
15 'use_libcc_for_compositor%': 0,
16 }, 14 },
17 'target_defaults': { 15 'target_defaults': {
18 # Disable narrowing-conversion-in-initialization-list warnings in that we 16 # Disable narrowing-conversion-in-initialization-list warnings in that we
19 # do not want to fix it in data file "webcursor_gtk_data.h". 17 # do not want to fix it in data file "webcursor_gtk_data.h".
20 'cflags+': ['-Wno-narrowing'], 18 'cflags+': ['-Wno-narrowing'],
21 'cflags_cc+': ['-Wno-narrowing'], 19 'cflags_cc+': ['-Wno-narrowing'],
22 }, 20 },
23 'targets': [ 21 'targets': [
24 { 22 {
25 'target_name': 'webkit_resources', 23 'target_name': 'webkit_resources',
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 465 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
468 ], 466 ],
469 }], 467 }],
470 ], 468 ],
471 }], 469 }],
472 ['inside_chromium_build==0', { 470 ['inside_chromium_build==0', {
473 'dependencies': [ 471 'dependencies': [
474 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', 472 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
475 ], 473 ],
476 }], 474 }],
477 ['use_libcc_for_compositor==1', {
478 'defines': [
479 'USE_LIBCC_FOR_COMPOSITOR',
480 ],
481 }],
482 ], 475 ],
483 }, 476 },
484 ], 477 ],
485 'conditions': [ 478 'conditions': [
486 ['use_third_party_translations==1', { 479 ['use_third_party_translations==1', {
487 'targets': [ 480 'targets': [
488 { 481 {
489 'target_name': 'inspector_strings', 482 'target_name': 'inspector_strings',
490 'type': 'none', 483 'type': 'none',
491 'variables': { 484 'variables': {
492 'grit_out_dir': '<(PRODUCT_DIR)/resources/inspector/l10n', 485 'grit_out_dir': '<(PRODUCT_DIR)/resources/inspector/l10n',
493 }, 486 },
494 'actions': [ 487 'actions': [
495 { 488 {
496 'action_name': 'inspector_strings', 489 'action_name': 'inspector_strings',
497 'variables': { 490 'variables': {
498 'grit_grd_file': 'inspector_strings.grd', 491 'grit_grd_file': 'inspector_strings.grd',
499 }, 492 },
500 'includes': [ '../../build/grit_action.gypi' ], 493 'includes': [ '../../build/grit_action.gypi' ],
501 }, 494 },
502 ], 495 ],
503 'includes': [ '../../build/grit_target.gypi' ], 496 'includes': [ '../../build/grit_target.gypi' ],
504 }, 497 },
505 ], 498 ],
506 }], 499 }],
507 ], 500 ],
508 } 501 }
OLDNEW
« no previous file with comments | « webkit/compositor_bindings/web_compositor_support_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698