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

Side by Side Diff: build/common.gypi

Issue 1490713002: 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 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 # See https://sites.google.com/a/google.com/chrome-msk/dev/boot-speed-up-e ffort 531 # See https://sites.google.com/a/google.com/chrome-msk/dev/boot-speed-up-e ffort
532 'order_text_section%' : "", 532 'order_text_section%' : "",
533 533
534 # Set to 1 compile with -fPIC cflag on linux. This is a must for shared 534 # Set to 1 compile with -fPIC cflag on linux. This is a must for shared
535 # libraries on linux x86-64 and arm, plus ASLR. 535 # libraries on linux x86-64 and arm, plus ASLR.
536 'linux_fpic%': 1, 536 'linux_fpic%': 1,
537 537
538 # Whether one-click signin is enabled or not. 538 # Whether one-click signin is enabled or not.
539 'enable_one_click_signin%': 0, 539 'enable_one_click_signin%': 0,
540 540
541 # Whether to back up data before sync.
542 'enable_pre_sync_backup%': 0,
543
541 # Enable Chrome browser extensions 544 # Enable Chrome browser extensions
542 'enable_extensions%': 1, 545 'enable_extensions%': 1,
543 546
544 # Enable basic printing support and UI. 547 # Enable basic printing support and UI.
545 'enable_basic_printing%': 1, 548 'enable_basic_printing%': 1,
546 549
547 # Enable printing with print preview. It does not imply 550 # Enable printing with print preview. It does not imply
548 # enable_basic_printing. It's possible to build Chrome with preview only. 551 # enable_basic_printing. It's possible to build Chrome with preview only.
549 'enable_print_preview%': 1, 552 'enable_print_preview%': 1,
550 553
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 805
803 # Enable loader extensions on Chrome OS. 806 # Enable loader extensions on Chrome OS.
804 ['chromeos==1', { 807 ['chromeos==1', {
805 'image_loader_extension%': 1, 808 'image_loader_extension%': 1,
806 }, { 809 }, {
807 'image_loader_extension%': 0, 810 'image_loader_extension%': 0,
808 }], 811 }],
809 812
810 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', { 813 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', {
811 'enable_one_click_signin%': 1, 814 'enable_one_click_signin%': 1,
815 'enable_pre_sync_backup%': 1,
812 }], 816 }],
813 817
814 ['OS=="android"', { 818 ['OS=="android"', {
815 'enable_extensions%': 0, 819 'enable_extensions%': 0,
816 'cld2_table_size%': 0, 820 'cld2_table_size%': 0,
817 'enable_themes%': 0, 821 'enable_themes%': 0,
818 'remoting%': 0, 822 'remoting%': 0,
819 'arm_neon%': 0, 823 'arm_neon%': 0,
820 'arm_neon_optional%': 1, 824 'arm_neon_optional%': 1,
821 'enable_basic_printing%': 1, 825 'enable_basic_printing%': 1,
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
1152 'pkg-config%': '<(pkg-config)', 1156 'pkg-config%': '<(pkg-config)',
1153 'chroot_cmd%': '<(chroot_cmd)', 1157 'chroot_cmd%': '<(chroot_cmd)',
1154 'system_libdir%': '<(system_libdir)', 1158 'system_libdir%': '<(system_libdir)',
1155 'component%': '<(component)', 1159 'component%': '<(component)',
1156 'win_analyze%': '<(win_analyze)', 1160 'win_analyze%': '<(win_analyze)',
1157 'win_fastlink%': '<(win_fastlink)', 1161 'win_fastlink%': '<(win_fastlink)',
1158 'enable_resource_whitelist_generation%': '<(enable_resource_whitelist_genera tion)', 1162 'enable_resource_whitelist_generation%': '<(enable_resource_whitelist_genera tion)',
1159 'use_titlecase_in_grd%': '<(use_titlecase_in_grd)', 1163 'use_titlecase_in_grd%': '<(use_titlecase_in_grd)',
1160 'remoting%': '<(remoting)', 1164 'remoting%': '<(remoting)',
1161 'enable_one_click_signin%': '<(enable_one_click_signin)', 1165 'enable_one_click_signin%': '<(enable_one_click_signin)',
1166 'enable_pre_sync_backup%': '<(enable_pre_sync_backup)',
1162 'enable_media_router%': '<(enable_media_router)', 1167 'enable_media_router%': '<(enable_media_router)',
1163 'enable_webrtc%': '<(enable_webrtc)', 1168 'enable_webrtc%': '<(enable_webrtc)',
1164 'chromium_win_pch%': '<(chromium_win_pch)', 1169 'chromium_win_pch%': '<(chromium_win_pch)',
1165 'configuration_policy%': '<(configuration_policy)', 1170 'configuration_policy%': '<(configuration_policy)',
1166 'safe_browsing%': '<(safe_browsing)', 1171 'safe_browsing%': '<(safe_browsing)',
1167 'enable_web_speech%': '<(enable_web_speech)', 1172 'enable_web_speech%': '<(enable_web_speech)',
1168 'enable_hotwording%': '<(enable_hotwording)', 1173 'enable_hotwording%': '<(enable_hotwording)',
1169 'notifications%': '<(notifications)', 1174 'notifications%': '<(notifications)',
1170 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 1175 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
1171 'mac_want_real_dsym%': '<(mac_want_real_dsym)', 1176 'mac_want_real_dsym%': '<(mac_want_real_dsym)',
(...skipping 1551 matching lines...) Expand 10 before | Expand all | Expand 10 after
2723 }], 2728 }],
2724 ['use_x11==1', { 2729 ['use_x11==1', {
2725 'defines': ['USE_X11=1'], 2730 'defines': ['USE_X11=1'],
2726 }], 2731 }],
2727 ['use_clipboard_aurax11==1', { 2732 ['use_clipboard_aurax11==1', {
2728 'defines': ['USE_CLIPBOARD_AURAX11=1'], 2733 'defines': ['USE_CLIPBOARD_AURAX11=1'],
2729 }], 2734 }],
2730 ['enable_one_click_signin==1', { 2735 ['enable_one_click_signin==1', {
2731 'defines': ['ENABLE_ONE_CLICK_SIGNIN'], 2736 'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
2732 }], 2737 }],
2738 ['enable_pre_sync_backup==1', {
2739 'defines': ['ENABLE_PRE_SYNC_BACKUP'],
2740 }],
2733 ['image_loader_extension==1', { 2741 ['image_loader_extension==1', {
2734 'defines': ['IMAGE_LOADER_EXTENSION=1'], 2742 'defines': ['IMAGE_LOADER_EXTENSION=1'],
2735 }], 2743 }],
2736 ['profiling==1', { 2744 ['profiling==1', {
2737 'defines': ['ENABLE_PROFILING=1'], 2745 'defines': ['ENABLE_PROFILING=1'],
2738 }], 2746 }],
2739 ['enable_webrtc==1', { 2747 ['enable_webrtc==1', {
2740 'defines': ['ENABLE_WEBRTC=1'], 2748 'defines': ['ENABLE_WEBRTC=1'],
2741 }], 2749 }],
2742 ['enable_media_router==1', { 2750 ['enable_media_router==1', {
(...skipping 3636 matching lines...) Expand 10 before | Expand all | Expand 10 after
6379 # settings in target dicts. SYMROOT is a special case, because many other 6387 # settings in target dicts. SYMROOT is a special case, because many other
6380 # Xcode variables depend on it, including variables such as 6388 # Xcode variables depend on it, including variables such as
6381 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6389 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6382 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6390 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6383 # files to appear (when present) in the UI as actual files and not red 6391 # files to appear (when present) in the UI as actual files and not red
6384 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6392 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6385 # and therefore SYMROOT, needs to be set at the project level. 6393 # and therefore SYMROOT, needs to be set at the project level.
6386 'SYMROOT': '<(DEPTH)/xcodebuild', 6394 'SYMROOT': '<(DEPTH)/xcodebuild',
6387 }, 6395 },
6388 } 6396 }
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