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

Side by Side Diff: build/common.gypi

Issue 1485933002: Revert of Convert enable_pre_sync_backup flag to new flags system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « build/buildflag_header.gypi ('k') | build/config/BUILD.gn » ('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 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 # See https://sites.google.com/a/google.com/chrome-msk/dev/boot-speed-up-e ffort 542 # See https://sites.google.com/a/google.com/chrome-msk/dev/boot-speed-up-e ffort
543 'order_text_section%' : "", 543 'order_text_section%' : "",
544 544
545 # Set to 1 compile with -fPIC cflag on linux. This is a must for shared 545 # Set to 1 compile with -fPIC cflag on linux. This is a must for shared
546 # libraries on linux x86-64 and arm, plus ASLR. 546 # libraries on linux x86-64 and arm, plus ASLR.
547 'linux_fpic%': 1, 547 'linux_fpic%': 1,
548 548
549 # Whether one-click signin is enabled or not. 549 # Whether one-click signin is enabled or not.
550 'enable_one_click_signin%': 0, 550 'enable_one_click_signin%': 0,
551 551
552 # Whether to back up data before sync.
553 'enable_pre_sync_backup%': 0,
554
552 # Enable Chrome browser extensions 555 # Enable Chrome browser extensions
553 'enable_extensions%': 1, 556 'enable_extensions%': 1,
554 557
555 # Enable basic printing support and UI. 558 # Enable basic printing support and UI.
556 'enable_basic_printing%': 1, 559 'enable_basic_printing%': 1,
557 560
558 # Enable printing with print preview. It does not imply 561 # Enable printing with print preview. It does not imply
559 # enable_basic_printing. It's possible to build Chrome with preview only. 562 # enable_basic_printing. It's possible to build Chrome with preview only.
560 'enable_print_preview%': 1, 563 'enable_print_preview%': 1,
561 564
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 807
805 # Enable loader extensions on Chrome OS. 808 # Enable loader extensions on Chrome OS.
806 ['chromeos==1', { 809 ['chromeos==1', {
807 'image_loader_extension%': 1, 810 'image_loader_extension%': 1,
808 }, { 811 }, {
809 'image_loader_extension%': 0, 812 'image_loader_extension%': 0,
810 }], 813 }],
811 814
812 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', { 815 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', {
813 'enable_one_click_signin%': 1, 816 'enable_one_click_signin%': 1,
817 'enable_pre_sync_backup%': 1,
814 }], 818 }],
815 819
816 ['OS=="android"', { 820 ['OS=="android"', {
817 'enable_extensions%': 0, 821 'enable_extensions%': 0,
818 'cld2_table_size%': 0, 822 'cld2_table_size%': 0,
819 'enable_themes%': 0, 823 'enable_themes%': 0,
820 'remoting%': 0, 824 'remoting%': 0,
821 'arm_neon%': 0, 825 'arm_neon%': 0,
822 'arm_neon_optional%': 1, 826 'arm_neon_optional%': 1,
823 'enable_basic_printing%': 1, 827 'enable_basic_printing%': 1,
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 'pkg-config%': '<(pkg-config)', 1158 'pkg-config%': '<(pkg-config)',
1155 'chroot_cmd%': '<(chroot_cmd)', 1159 'chroot_cmd%': '<(chroot_cmd)',
1156 'system_libdir%': '<(system_libdir)', 1160 'system_libdir%': '<(system_libdir)',
1157 'component%': '<(component)', 1161 'component%': '<(component)',
1158 'win_analyze%': '<(win_analyze)', 1162 'win_analyze%': '<(win_analyze)',
1159 'win_fastlink%': '<(win_fastlink)', 1163 'win_fastlink%': '<(win_fastlink)',
1160 'enable_resource_whitelist_generation%': '<(enable_resource_whitelist_genera tion)', 1164 'enable_resource_whitelist_generation%': '<(enable_resource_whitelist_genera tion)',
1161 'use_titlecase_in_grd%': '<(use_titlecase_in_grd)', 1165 'use_titlecase_in_grd%': '<(use_titlecase_in_grd)',
1162 'remoting%': '<(remoting)', 1166 'remoting%': '<(remoting)',
1163 'enable_one_click_signin%': '<(enable_one_click_signin)', 1167 'enable_one_click_signin%': '<(enable_one_click_signin)',
1168 'enable_pre_sync_backup%': '<(enable_pre_sync_backup)',
1164 'enable_media_router%': '<(enable_media_router)', 1169 'enable_media_router%': '<(enable_media_router)',
1165 'enable_webrtc%': '<(enable_webrtc)', 1170 'enable_webrtc%': '<(enable_webrtc)',
1166 'chromium_win_pch%': '<(chromium_win_pch)', 1171 'chromium_win_pch%': '<(chromium_win_pch)',
1167 'configuration_policy%': '<(configuration_policy)', 1172 'configuration_policy%': '<(configuration_policy)',
1168 'safe_browsing%': '<(safe_browsing)', 1173 'safe_browsing%': '<(safe_browsing)',
1169 'enable_web_speech%': '<(enable_web_speech)', 1174 'enable_web_speech%': '<(enable_web_speech)',
1170 'enable_hotwording%': '<(enable_hotwording)', 1175 'enable_hotwording%': '<(enable_hotwording)',
1171 'notifications%': '<(notifications)', 1176 'notifications%': '<(notifications)',
1172 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 1177 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
1173 'mac_want_real_dsym%': '<(mac_want_real_dsym)', 1178 'mac_want_real_dsym%': '<(mac_want_real_dsym)',
(...skipping 1535 matching lines...) Expand 10 before | Expand all | Expand 10 after
2709 }], 2714 }],
2710 ['use_x11==1', { 2715 ['use_x11==1', {
2711 'defines': ['USE_X11=1'], 2716 'defines': ['USE_X11=1'],
2712 }], 2717 }],
2713 ['use_clipboard_aurax11==1', { 2718 ['use_clipboard_aurax11==1', {
2714 'defines': ['USE_CLIPBOARD_AURAX11=1'], 2719 'defines': ['USE_CLIPBOARD_AURAX11=1'],
2715 }], 2720 }],
2716 ['enable_one_click_signin==1', { 2721 ['enable_one_click_signin==1', {
2717 'defines': ['ENABLE_ONE_CLICK_SIGNIN'], 2722 'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
2718 }], 2723 }],
2724 ['enable_pre_sync_backup==1', {
2725 'defines': ['ENABLE_PRE_SYNC_BACKUP'],
2726 }],
2719 ['image_loader_extension==1', { 2727 ['image_loader_extension==1', {
2720 'defines': ['IMAGE_LOADER_EXTENSION=1'], 2728 'defines': ['IMAGE_LOADER_EXTENSION=1'],
2721 }], 2729 }],
2722 ['profiling==1', { 2730 ['profiling==1', {
2723 'defines': ['ENABLE_PROFILING=1'], 2731 'defines': ['ENABLE_PROFILING=1'],
2724 }], 2732 }],
2725 ['enable_webrtc==1', { 2733 ['enable_webrtc==1', {
2726 'defines': ['ENABLE_WEBRTC=1'], 2734 'defines': ['ENABLE_WEBRTC=1'],
2727 }], 2735 }],
2728 ['enable_media_router==1', { 2736 ['enable_media_router==1', {
(...skipping 3629 matching lines...) Expand 10 before | Expand all | Expand 10 after
6358 # settings in target dicts. SYMROOT is a special case, because many other 6366 # settings in target dicts. SYMROOT is a special case, because many other
6359 # Xcode variables depend on it, including variables such as 6367 # Xcode variables depend on it, including variables such as
6360 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6368 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6361 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6369 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6362 # files to appear (when present) in the UI as actual files and not red 6370 # files to appear (when present) in the UI as actual files and not red
6363 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6371 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6364 # and therefore SYMROOT, needs to be set at the project level. 6372 # and therefore SYMROOT, needs to be set at the project level.
6365 'SYMROOT': '<(DEPTH)/xcodebuild', 6373 'SYMROOT': '<(DEPTH)/xcodebuild',
6366 }, 6374 },
6367 } 6375 }
OLDNEW
« no previous file with comments | « build/buildflag_header.gypi ('k') | build/config/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698