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

Side by Side Diff: build/common.gypi

Issue 11493003: Remove the protector service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix implicit ExtensionSystem -> TemplateURLService dependency 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
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | 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 # 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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 'clang%': 0, 372 'clang%': 0,
373 373
374 # Enable plug-in installation by default. 374 # Enable plug-in installation by default.
375 'enable_plugin_installation%': 1, 375 'enable_plugin_installation%': 1,
376 376
377 # Enable PPAPI and NPAPI by default. 377 # Enable PPAPI and NPAPI by default.
378 # TODO(nileshagrawal): Make this flag enable/disable NPAPI as well 378 # TODO(nileshagrawal): Make this flag enable/disable NPAPI as well
379 # as PPAPI; see crbug.com/162667. 379 # as PPAPI; see crbug.com/162667.
380 'enable_plugins%': 1, 380 'enable_plugins%': 1,
381 381
382 # Enable protector service by default.
383 'enable_protector_service%': 1,
384
385 # Specifies whether to use canvas_skia.cc in place of platform 382 # Specifies whether to use canvas_skia.cc in place of platform
386 # specific implementations of gfx::Canvas. Affects text drawing in the 383 # specific implementations of gfx::Canvas. Affects text drawing in the
387 # Chrome UI. 384 # Chrome UI.
388 # TODO(asvitkine): Enable this on all platforms and delete this flag. 385 # TODO(asvitkine): Enable this on all platforms and delete this flag.
389 # http://crbug.com/105550 386 # http://crbug.com/105550
390 'use_canvas_skia%': 0, 387 'use_canvas_skia%': 0,
391 388
392 # Set to "tsan", "memcheck", or "drmemory" to configure the build to work 389 # Set to "tsan", "memcheck", or "drmemory" to configure the build to work
393 # with one of those tools. 390 # with one of those tools.
394 'build_for_tool%': '', 391 'build_for_tool%': '',
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 }, { 525 }, {
529 'enable_plugin_installation%': 1, 526 'enable_plugin_installation%': 1,
530 }], 527 }],
531 528
532 ['OS=="android" or OS=="ios"', { 529 ['OS=="android" or OS=="ios"', {
533 'enable_plugins%': 0, 530 'enable_plugins%': 0,
534 }, { 531 }, {
535 'enable_plugins%': 1, 532 'enable_plugins%': 1,
536 }], 533 }],
537 534
538 ['OS=="android" or OS=="ios"', {
539 'enable_protector_service%': 0,
540 }, {
541 'enable_protector_service%': 1,
542 }],
543
544 # linux_use_gold_binary: whether to use the binary checked into 535 # linux_use_gold_binary: whether to use the binary checked into
545 # third_party/gold. 536 # third_party/gold.
546 ['OS=="linux"', { 537 ['OS=="linux"', {
547 'linux_use_gold_binary%': 1, 538 'linux_use_gold_binary%': 1,
548 }, { 539 }, {
549 'linux_use_gold_binary%': 0, 540 'linux_use_gold_binary%': 0,
550 }], 541 }],
551 542
552 # linux_use_gold_flags: whether to use build flags that rely on gold. 543 # linux_use_gold_flags: whether to use build flags that rely on gold.
553 # On by default for x64 Linux. Temporarily off for ChromeOS as 544 # On by default for x64 Linux. Temporarily off for ChromeOS as
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 'tsan%': '<(tsan)', 681 'tsan%': '<(tsan)',
691 'tsan_blacklist%': '<(tsan_blacklist)', 682 'tsan_blacklist%': '<(tsan_blacklist)',
692 'clang_type_profiler%': '<(clang_type_profiler)', 683 'clang_type_profiler%': '<(clang_type_profiler)',
693 'order_profiling%': '<(order_profiling)', 684 'order_profiling%': '<(order_profiling)',
694 'order_text_section%': '<(order_text_section)', 685 'order_text_section%': '<(order_text_section)',
695 'enable_extensions%': '<(enable_extensions)', 686 'enable_extensions%': '<(enable_extensions)',
696 'enable_web_intents%': '<(enable_web_intents)', 687 'enable_web_intents%': '<(enable_web_intents)',
697 'enable_web_intents_tag%': '<(enable_web_intents_tag)', 688 'enable_web_intents_tag%': '<(enable_web_intents_tag)',
698 'enable_plugin_installation%': '<(enable_plugin_installation)', 689 'enable_plugin_installation%': '<(enable_plugin_installation)',
699 'enable_plugins%': '<(enable_plugins)', 690 'enable_plugins%': '<(enable_plugins)',
700 'enable_protector_service%': '<(enable_protector_service)',
701 'enable_session_service%': '<(enable_session_service)', 691 'enable_session_service%': '<(enable_session_service)',
702 'enable_themes%': '<(enable_themes)', 692 'enable_themes%': '<(enable_themes)',
703 'use_oem_wallpaper%': '<(use_oem_wallpaper)', 693 'use_oem_wallpaper%': '<(use_oem_wallpaper)',
704 'enable_background%': '<(enable_background)', 694 'enable_background%': '<(enable_background)',
705 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 695 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
706 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 696 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
707 'use_canvas_skia%': '<(use_canvas_skia)', 697 'use_canvas_skia%': '<(use_canvas_skia)',
708 'test_isolation_mode%': '<(test_isolation_mode)', 698 'test_isolation_mode%': '<(test_isolation_mode)',
709 'test_isolation_outdir%': '<(test_isolation_outdir)', 699 'test_isolation_outdir%': '<(test_isolation_outdir)',
710 'enable_automation%': '<(enable_automation)', 700 'enable_automation%': '<(enable_automation)',
(...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after
1884 }], 1874 }],
1885 ['enable_dart==1', { 1875 ['enable_dart==1', {
1886 'defines': ['WEBKIT_USING_DART=1'], 1876 'defines': ['WEBKIT_USING_DART=1'],
1887 }], 1877 }],
1888 ['enable_plugin_installation==1', { 1878 ['enable_plugin_installation==1', {
1889 'defines': ['ENABLE_PLUGIN_INSTALLATION=1'], 1879 'defines': ['ENABLE_PLUGIN_INSTALLATION=1'],
1890 }], 1880 }],
1891 ['enable_plugins==1', { 1881 ['enable_plugins==1', {
1892 'defines': ['ENABLE_PLUGINS=1'], 1882 'defines': ['ENABLE_PLUGINS=1'],
1893 }], 1883 }],
1894 ['enable_protector_service==1', {
1895 'defines': ['ENABLE_PROTECTOR_SERVICE=1'],
1896 }],
1897 ['enable_session_service==1', { 1884 ['enable_session_service==1', {
1898 'defines': ['ENABLE_SESSION_SERVICE=1'], 1885 'defines': ['ENABLE_SESSION_SERVICE=1'],
1899 }], 1886 }],
1900 ['enable_themes==1', { 1887 ['enable_themes==1', {
1901 'defines': ['ENABLE_THEMES=1'], 1888 'defines': ['ENABLE_THEMES=1'],
1902 }], 1889 }],
1903 ['enable_background==1', { 1890 ['enable_background==1', {
1904 'defines': ['ENABLE_BACKGROUND=1'], 1891 'defines': ['ENABLE_BACKGROUND=1'],
1905 }], 1892 }],
1906 ['enable_automation==1', { 1893 ['enable_automation==1', {
(...skipping 2023 matching lines...) Expand 10 before | Expand all | Expand 10 after
3930 # settings in target dicts. SYMROOT is a special case, because many other 3917 # settings in target dicts. SYMROOT is a special case, because many other
3931 # Xcode variables depend on it, including variables such as 3918 # Xcode variables depend on it, including variables such as
3932 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3919 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3933 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3920 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3934 # files to appear (when present) in the UI as actual files and not red 3921 # files to appear (when present) in the UI as actual files and not red
3935 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3922 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3936 # and therefore SYMROOT, needs to be set at the project level. 3923 # and therefore SYMROOT, needs to be set at the project level.
3937 'SYMROOT': '<(DEPTH)/xcodebuild', 3924 'SYMROOT': '<(DEPTH)/xcodebuild',
3938 }, 3925 },
3939 } 3926 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698