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

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 failing WebDataMigration tests 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 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 'clang%': 0, 370 'clang%': 0,
371 371
372 # Enable plug-in installation by default. 372 # Enable plug-in installation by default.
373 'enable_plugin_installation%': 1, 373 'enable_plugin_installation%': 1,
374 374
375 # Enable PPAPI and NPAPI by default. 375 # Enable PPAPI and NPAPI by default.
376 # TODO(nileshagrawal): Make this flag enable/disable NPAPI as well 376 # TODO(nileshagrawal): Make this flag enable/disable NPAPI as well
377 # as PPAPI; see crbug.com/162667. 377 # as PPAPI; see crbug.com/162667.
378 'enable_plugins%': 1, 378 'enable_plugins%': 1,
379 379
380 # Enable protector service by default.
381 'enable_protector_service%': 1,
382
383 # Specifies whether to use canvas_skia.cc in place of platform 380 # Specifies whether to use canvas_skia.cc in place of platform
384 # specific implementations of gfx::Canvas. Affects text drawing in the 381 # specific implementations of gfx::Canvas. Affects text drawing in the
385 # Chrome UI. 382 # Chrome UI.
386 # TODO(asvitkine): Enable this on all platforms and delete this flag. 383 # TODO(asvitkine): Enable this on all platforms and delete this flag.
387 # http://crbug.com/105550 384 # http://crbug.com/105550
388 'use_canvas_skia%': 0, 385 'use_canvas_skia%': 0,
389 386
390 # Set to "tsan", "memcheck", or "drmemory" to configure the build to work 387 # Set to "tsan", "memcheck", or "drmemory" to configure the build to work
391 # with one of those tools. 388 # with one of those tools.
392 'build_for_tool%': '', 389 'build_for_tool%': '',
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 }, { 523 }, {
527 'enable_plugin_installation%': 1, 524 'enable_plugin_installation%': 1,
528 }], 525 }],
529 526
530 ['OS=="android" or OS=="ios"', { 527 ['OS=="android" or OS=="ios"', {
531 'enable_plugins%': 0, 528 'enable_plugins%': 0,
532 }, { 529 }, {
533 'enable_plugins%': 1, 530 'enable_plugins%': 1,
534 }], 531 }],
535 532
536 ['OS=="android" or OS=="ios"', {
537 'enable_protector_service%': 0,
538 }, {
539 'enable_protector_service%': 1,
540 }],
541
542 # linux_use_gold_binary: whether to use the binary checked into 533 # linux_use_gold_binary: whether to use the binary checked into
543 # third_party/gold. 534 # third_party/gold.
544 ['OS=="linux"', { 535 ['OS=="linux"', {
545 'linux_use_gold_binary%': 1, 536 'linux_use_gold_binary%': 1,
546 }, { 537 }, {
547 'linux_use_gold_binary%': 0, 538 'linux_use_gold_binary%': 0,
548 }], 539 }],
549 540
550 # linux_use_gold_flags: whether to use build flags that rely on gold. 541 # linux_use_gold_flags: whether to use build flags that rely on gold.
551 # On by default for x64 Linux. Temporarily off for ChromeOS as 542 # On by default for x64 Linux. Temporarily off for ChromeOS as
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 'tsan%': '<(tsan)', 668 'tsan%': '<(tsan)',
678 'tsan_blacklist%': '<(tsan_blacklist)', 669 'tsan_blacklist%': '<(tsan_blacklist)',
679 'clang_type_profiler%': '<(clang_type_profiler)', 670 'clang_type_profiler%': '<(clang_type_profiler)',
680 'order_profiling%': '<(order_profiling)', 671 'order_profiling%': '<(order_profiling)',
681 'order_text_section%': '<(order_text_section)', 672 'order_text_section%': '<(order_text_section)',
682 'enable_extensions%': '<(enable_extensions)', 673 'enable_extensions%': '<(enable_extensions)',
683 'enable_web_intents%': '<(enable_web_intents)', 674 'enable_web_intents%': '<(enable_web_intents)',
684 'enable_web_intents_tag%': '<(enable_web_intents_tag)', 675 'enable_web_intents_tag%': '<(enable_web_intents_tag)',
685 'enable_plugin_installation%': '<(enable_plugin_installation)', 676 'enable_plugin_installation%': '<(enable_plugin_installation)',
686 'enable_plugins%': '<(enable_plugins)', 677 'enable_plugins%': '<(enable_plugins)',
687 'enable_protector_service%': '<(enable_protector_service)',
688 'enable_session_service%': '<(enable_session_service)', 678 'enable_session_service%': '<(enable_session_service)',
689 'enable_themes%': '<(enable_themes)', 679 'enable_themes%': '<(enable_themes)',
690 'use_oem_wallpaper%': '<(use_oem_wallpaper)', 680 'use_oem_wallpaper%': '<(use_oem_wallpaper)',
691 'enable_background%': '<(enable_background)', 681 'enable_background%': '<(enable_background)',
692 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 682 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
693 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 683 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
694 'use_canvas_skia%': '<(use_canvas_skia)', 684 'use_canvas_skia%': '<(use_canvas_skia)',
695 'test_isolation_mode%': '<(test_isolation_mode)', 685 'test_isolation_mode%': '<(test_isolation_mode)',
696 'test_isolation_outdir%': '<(test_isolation_outdir)', 686 'test_isolation_outdir%': '<(test_isolation_outdir)',
697 'enable_automation%': '<(enable_automation)', 687 'enable_automation%': '<(enable_automation)',
(...skipping 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after
1873 }], 1863 }],
1874 ['enable_dart==1', { 1864 ['enable_dart==1', {
1875 'defines': ['WEBKIT_USING_DART=1'], 1865 'defines': ['WEBKIT_USING_DART=1'],
1876 }], 1866 }],
1877 ['enable_plugin_installation==1', { 1867 ['enable_plugin_installation==1', {
1878 'defines': ['ENABLE_PLUGIN_INSTALLATION=1'], 1868 'defines': ['ENABLE_PLUGIN_INSTALLATION=1'],
1879 }], 1869 }],
1880 ['enable_plugins==1', { 1870 ['enable_plugins==1', {
1881 'defines': ['ENABLE_PLUGINS=1'], 1871 'defines': ['ENABLE_PLUGINS=1'],
1882 }], 1872 }],
1883 ['enable_protector_service==1', {
1884 'defines': ['ENABLE_PROTECTOR_SERVICE=1'],
1885 }],
1886 ['enable_session_service==1', { 1873 ['enable_session_service==1', {
1887 'defines': ['ENABLE_SESSION_SERVICE=1'], 1874 'defines': ['ENABLE_SESSION_SERVICE=1'],
1888 }], 1875 }],
1889 ['enable_themes==1', { 1876 ['enable_themes==1', {
1890 'defines': ['ENABLE_THEMES=1'], 1877 'defines': ['ENABLE_THEMES=1'],
1891 }], 1878 }],
1892 ['enable_background==1', { 1879 ['enable_background==1', {
1893 'defines': ['ENABLE_BACKGROUND=1'], 1880 'defines': ['ENABLE_BACKGROUND=1'],
1894 }], 1881 }],
1895 ['enable_automation==1', { 1882 ['enable_automation==1', {
(...skipping 2024 matching lines...) Expand 10 before | Expand all | Expand 10 after
3920 # settings in target dicts. SYMROOT is a special case, because many other 3907 # settings in target dicts. SYMROOT is a special case, because many other
3921 # Xcode variables depend on it, including variables such as 3908 # Xcode variables depend on it, including variables such as
3922 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3909 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3923 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3910 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3924 # files to appear (when present) in the UI as actual files and not red 3911 # files to appear (when present) in the UI as actual files and not red
3925 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3912 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3926 # and therefore SYMROOT, needs to be set at the project level. 3913 # and therefore SYMROOT, needs to be set at the project level.
3927 'SYMROOT': '<(DEPTH)/xcodebuild', 3914 'SYMROOT': '<(DEPTH)/xcodebuild',
3928 }, 3915 },
3929 } 3916 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | chrome/browser/webdata/keyword_table.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698