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

Side by Side Diff: build/common.gypi

Issue 11414180: Add a gyp flag to allow removing dependency on ppapi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Jay's comments and rebase Created 8 years 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
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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 # for details. 369 # for details.
370 'chromium_win_pch%': 0, 370 'chromium_win_pch%': 0,
371 371
372 # Set this to true when building with Clang. 372 # Set this to true when building with Clang.
373 # See http://code.google.com/p/chromium/wiki/Clang for details. 373 # See http://code.google.com/p/chromium/wiki/Clang for details.
374 'clang%': 0, 374 'clang%': 0,
375 375
376 # Enable plug-in installation by default. 376 # Enable plug-in installation by default.
377 'enable_plugin_installation%': 1, 377 'enable_plugin_installation%': 1,
378 378
379 # Enable ppapi by default.
380 'enable_ppapi%': 1,
381
379 # Enable protector service by default. 382 # Enable protector service by default.
380 'enable_protector_service%': 1, 383 'enable_protector_service%': 1,
381 384
382 # Specifies whether to use canvas_skia.cc in place of platform 385 # Specifies whether to use canvas_skia.cc in place of platform
383 # specific implementations of gfx::Canvas. Affects text drawing in the 386 # specific implementations of gfx::Canvas. Affects text drawing in the
384 # Chrome UI. 387 # Chrome UI.
385 # TODO(asvitkine): Enable this on all platforms and delete this flag. 388 # TODO(asvitkine): Enable this on all platforms and delete this flag.
386 # http://crbug.com/105550 389 # http://crbug.com/105550
387 'use_canvas_skia%': 0, 390 'use_canvas_skia%': 0,
388 391
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 'chromium_win_pch%': 1 521 'chromium_win_pch%': 1
519 }], 522 }],
520 523
521 ['use_aura==1 or chromeos==1 or OS=="android"', { 524 ['use_aura==1 or chromeos==1 or OS=="android"', {
522 'enable_plugin_installation%': 0, 525 'enable_plugin_installation%': 0,
523 }, { 526 }, {
524 'enable_plugin_installation%': 1, 527 'enable_plugin_installation%': 1,
525 }], 528 }],
526 529
527 ['OS=="android" or OS=="ios"', { 530 ['OS=="android" or OS=="ios"', {
531 'enable_ppapi%': 0,
532 }, {
533 'enable_ppapi%': 1,
534 }],
535
536 ['OS=="android" or OS=="ios"', {
528 'enable_protector_service%': 0, 537 'enable_protector_service%': 0,
529 }, { 538 }, {
530 'enable_protector_service%': 1, 539 'enable_protector_service%': 1,
531 }], 540 }],
532 541
533 # linux_use_gold_binary: whether to use the binary checked into 542 # linux_use_gold_binary: whether to use the binary checked into
534 # third_party/gold. 543 # third_party/gold.
535 ['OS=="linux"', { 544 ['OS=="linux"', {
536 'linux_use_gold_binary%': 1, 545 'linux_use_gold_binary%': 1,
537 }, { 546 }, {
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 'asan%': '<(asan)', 676 'asan%': '<(asan)',
668 'tsan%': '<(tsan)', 677 'tsan%': '<(tsan)',
669 'tsan_blacklist%': '<(tsan_blacklist)', 678 'tsan_blacklist%': '<(tsan_blacklist)',
670 'clang_type_profiler%': '<(clang_type_profiler)', 679 'clang_type_profiler%': '<(clang_type_profiler)',
671 'order_profiling%': '<(order_profiling)', 680 'order_profiling%': '<(order_profiling)',
672 'order_text_section%': '<(order_text_section)', 681 'order_text_section%': '<(order_text_section)',
673 'enable_extensions%': '<(enable_extensions)', 682 'enable_extensions%': '<(enable_extensions)',
674 'enable_web_intents%': '<(enable_web_intents)', 683 'enable_web_intents%': '<(enable_web_intents)',
675 'enable_web_intents_tag%': '<(enable_web_intents_tag)', 684 'enable_web_intents_tag%': '<(enable_web_intents_tag)',
676 'enable_plugin_installation%': '<(enable_plugin_installation)', 685 'enable_plugin_installation%': '<(enable_plugin_installation)',
686 'enable_ppapi%': '<(enable_ppapi)',
677 'enable_protector_service%': '<(enable_protector_service)', 687 'enable_protector_service%': '<(enable_protector_service)',
678 'enable_session_service%': '<(enable_session_service)', 688 'enable_session_service%': '<(enable_session_service)',
679 'enable_themes%': '<(enable_themes)', 689 'enable_themes%': '<(enable_themes)',
680 'use_oem_wallpaper%': '<(use_oem_wallpaper)', 690 'use_oem_wallpaper%': '<(use_oem_wallpaper)',
681 'enable_background%': '<(enable_background)', 691 'enable_background%': '<(enable_background)',
682 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 692 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
683 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 693 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
684 'use_canvas_skia%': '<(use_canvas_skia)', 694 'use_canvas_skia%': '<(use_canvas_skia)',
685 'test_isolation_mode%': '<(test_isolation_mode)', 695 'test_isolation_mode%': '<(test_isolation_mode)',
686 'test_isolation_outdir%': '<(test_isolation_outdir)', 696 'test_isolation_outdir%': '<(test_isolation_outdir)',
(...skipping 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after
1862 }], 1872 }],
1863 ['OS=="win" and branding=="Chrome"', { 1873 ['OS=="win" and branding=="Chrome"', {
1864 'defines': ['ENABLE_SWIFTSHADER'], 1874 'defines': ['ENABLE_SWIFTSHADER'],
1865 }], 1875 }],
1866 ['enable_dart==1', { 1876 ['enable_dart==1', {
1867 'defines': ['WEBKIT_USING_DART=1'], 1877 'defines': ['WEBKIT_USING_DART=1'],
1868 }], 1878 }],
1869 ['enable_plugin_installation==1', { 1879 ['enable_plugin_installation==1', {
1870 'defines': ['ENABLE_PLUGIN_INSTALLATION=1'], 1880 'defines': ['ENABLE_PLUGIN_INSTALLATION=1'],
1871 }], 1881 }],
1882 ['enable_ppapi==1', {
1883 'defines': ['ENABLE_PPAPI=1'],
1884 }],
1872 ['enable_protector_service==1', { 1885 ['enable_protector_service==1', {
1873 'defines': ['ENABLE_PROTECTOR_SERVICE=1'], 1886 'defines': ['ENABLE_PROTECTOR_SERVICE=1'],
1874 }], 1887 }],
1875 ['enable_session_service==1', { 1888 ['enable_session_service==1', {
1876 'defines': ['ENABLE_SESSION_SERVICE=1'], 1889 'defines': ['ENABLE_SESSION_SERVICE=1'],
1877 }], 1890 }],
1878 ['enable_themes==1', { 1891 ['enable_themes==1', {
1879 'defines': ['ENABLE_THEMES=1'], 1892 'defines': ['ENABLE_THEMES=1'],
1880 }], 1893 }],
1881 ['enable_background==1', { 1894 ['enable_background==1', {
(...skipping 2000 matching lines...) Expand 10 before | Expand all | Expand 10 after
3882 # settings in target dicts. SYMROOT is a special case, because many other 3895 # settings in target dicts. SYMROOT is a special case, because many other
3883 # Xcode variables depend on it, including variables such as 3896 # Xcode variables depend on it, including variables such as
3884 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3897 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3885 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3898 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3886 # files to appear (when present) in the UI as actual files and not red 3899 # files to appear (when present) in the UI as actual files and not red
3887 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3900 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3888 # and therefore SYMROOT, needs to be set at the project level. 3901 # and therefore SYMROOT, needs to be set at the project level.
3889 'SYMROOT': '<(DEPTH)/xcodebuild', 3902 'SYMROOT': '<(DEPTH)/xcodebuild',
3890 }, 3903 },
3891 } 3904 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browsing_data/browsing_data_remover.h » ('j') | chrome/chrome_browser.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698