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

Side by Side Diff: build/common.gypi

Issue 1475883002: Revert of New build flag system, convert Google Now flag (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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 540
541 # Whether one-click signin is enabled or not. 541 # Whether one-click signin is enabled or not.
542 'enable_one_click_signin%': 0, 542 'enable_one_click_signin%': 0,
543 543
544 # Whether to back up data before sync. 544 # Whether to back up data before sync.
545 'enable_pre_sync_backup%': 0, 545 'enable_pre_sync_backup%': 0,
546 546
547 # Enable Chrome browser extensions 547 # Enable Chrome browser extensions
548 'enable_extensions%': 1, 548 'enable_extensions%': 1,
549 549
550 # Enable Google Now.
551 'enable_google_now%': 1,
552
550 # Enable basic printing support and UI. 553 # Enable basic printing support and UI.
551 'enable_basic_printing%': 1, 554 'enable_basic_printing%': 1,
552 555
553 # Enable printing with print preview. It does not imply 556 # Enable printing with print preview. It does not imply
554 # enable_basic_printing. It's possible to build Chrome with preview only. 557 # enable_basic_printing. It's possible to build Chrome with preview only.
555 'enable_print_preview%': 1, 558 'enable_print_preview%': 1,
556 559
557 # Set the version of CLD. 560 # Set the version of CLD.
558 # 1: (DEPRECATED! See http://crbug.com/528305 for info) Use only CLD1. 561 # 1: (DEPRECATED! See http://crbug.com/528305 for info) Use only CLD1.
559 # 2: Use only CLD2. 562 # 2: Use only CLD2.
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
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,
814 'enable_pre_sync_backup%': 1, 817 'enable_pre_sync_backup%': 1,
815 }], 818 }],
816 819
817 ['OS=="android"', { 820 ['OS=="android"', {
818 'enable_extensions%': 0, 821 'enable_extensions%': 0,
822 'enable_google_now%': 0,
819 'cld2_table_size%': 0, 823 'cld2_table_size%': 0,
820 'enable_themes%': 0, 824 'enable_themes%': 0,
821 'remoting%': 0, 825 'remoting%': 0,
822 'arm_neon%': 0, 826 'arm_neon%': 0,
823 'arm_neon_optional%': 1, 827 'arm_neon_optional%': 1,
824 'enable_basic_printing%': 1, 828 'enable_basic_printing%': 1,
825 'enable_print_preview%': 0, 829 'enable_print_preview%': 0,
826 'enable_task_manager%':0, 830 'enable_task_manager%':0,
827 'video_hole%': 1, 831 'video_hole%': 1,
828 }], 832 }],
(...skipping 27 matching lines...) Expand all
856 }], 860 }],
857 861
858 ['OS=="android"', { 862 ['OS=="android"', {
859 'enable_webrtc%': 1, 863 'enable_webrtc%': 1,
860 }], 864 }],
861 865
862 ['OS=="ios"', { 866 ['OS=="ios"', {
863 'configuration_policy%': 0, 867 'configuration_policy%': 0,
864 'disable_ftp_support%': 1, 868 'disable_ftp_support%': 1,
865 'enable_extensions%': 0, 869 'enable_extensions%': 0,
870 'enable_google_now%': 0,
866 'cld2_table_size%': 0, 871 'cld2_table_size%': 0,
867 'enable_basic_printing%': 0, 872 'enable_basic_printing%': 0,
868 'enable_print_preview%': 0, 873 'enable_print_preview%': 0,
869 'enable_session_service%': 0, 874 'enable_session_service%': 0,
870 'enable_spellcheck%': 0, 875 'enable_spellcheck%': 0,
871 'enable_themes%': 0, 876 'enable_themes%': 0,
872 'enable_webrtc%': 0, 877 'enable_webrtc%': 0,
873 'notifications%': 0, 878 'notifications%': 0,
874 'remoting%': 0, 879 'remoting%': 0,
875 'safe_browsing%': 2, 880 'safe_browsing%': 2,
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
1209 'linux_use_bundled_gold%': '<(linux_use_bundled_gold)', 1214 'linux_use_bundled_gold%': '<(linux_use_bundled_gold)',
1210 'linux_use_bundled_binutils%': '<(linux_use_bundled_binutils)', 1215 'linux_use_bundled_binutils%': '<(linux_use_bundled_binutils)',
1211 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 1216 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
1212 'linux_use_debug_fission%': '<(linux_use_debug_fission)', 1217 'linux_use_debug_fission%': '<(linux_use_debug_fission)',
1213 'use_canvas_skia%': '<(use_canvas_skia)', 1218 'use_canvas_skia%': '<(use_canvas_skia)',
1214 'test_isolation_mode%': '<(test_isolation_mode)', 1219 'test_isolation_mode%': '<(test_isolation_mode)',
1215 'enable_basic_printing%': '<(enable_basic_printing)', 1220 'enable_basic_printing%': '<(enable_basic_printing)',
1216 'enable_print_preview%': '<(enable_print_preview)', 1221 'enable_print_preview%': '<(enable_print_preview)',
1217 'enable_spellcheck%': '<(enable_spellcheck)', 1222 'enable_spellcheck%': '<(enable_spellcheck)',
1218 'use_browser_spellchecker%': '<(use_browser_spellchecker)', 1223 'use_browser_spellchecker%': '<(use_browser_spellchecker)',
1224 'enable_google_now%': '<(enable_google_now)',
1219 'cld_version%': '<(cld_version)', 1225 'cld_version%': '<(cld_version)',
1220 'cld2_table_size%': '<(cld2_table_size)', 1226 'cld2_table_size%': '<(cld2_table_size)',
1221 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 1227 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
1222 'disable_file_support%': '<(disable_file_support)', 1228 'disable_file_support%': '<(disable_file_support)',
1223 'disable_ftp_support%': '<(disable_ftp_support)', 1229 'disable_ftp_support%': '<(disable_ftp_support)',
1224 'enable_task_manager%': '<(enable_task_manager)', 1230 'enable_task_manager%': '<(enable_task_manager)',
1225 'sas_dll_path%': '<(sas_dll_path)', 1231 'sas_dll_path%': '<(sas_dll_path)',
1226 'wix_path%': '<(wix_path)', 1232 'wix_path%': '<(wix_path)',
1227 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 1233 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
1228 'use_system_libjpeg%': '<(use_system_libjpeg)', 1234 'use_system_libjpeg%': '<(use_system_libjpeg)',
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after
2170 }], 2176 }],
2171 ['enable_themes==1', { 2177 ['enable_themes==1', {
2172 'grit_defines': ['-D', 'enable_themes'], 2178 'grit_defines': ['-D', 'enable_themes'],
2173 }], 2179 }],
2174 ['enable_app_list==1', { 2180 ['enable_app_list==1', {
2175 'grit_defines': ['-D', 'enable_app_list'], 2181 'grit_defines': ['-D', 'enable_app_list'],
2176 }], 2182 }],
2177 ['enable_settings_app==1', { 2183 ['enable_settings_app==1', {
2178 'grit_defines': ['-D', 'enable_settings_app'], 2184 'grit_defines': ['-D', 'enable_settings_app'],
2179 }], 2185 }],
2186 ['enable_google_now==1', {
2187 'grit_defines': ['-D', 'enable_google_now'],
2188 }],
2180 ['use_concatenated_impulse_responses==1', { 2189 ['use_concatenated_impulse_responses==1', {
2181 'grit_defines': ['-D', 'use_concatenated_impulse_responses'], 2190 'grit_defines': ['-D', 'use_concatenated_impulse_responses'],
2182 }], 2191 }],
2183 ['enable_media_router==1', { 2192 ['enable_media_router==1', {
2184 'grit_defines': ['-D', 'enable_media_router'], 2193 'grit_defines': ['-D', 'enable_media_router'],
2185 }], 2194 }],
2186 ['enable_webrtc==1', { 2195 ['enable_webrtc==1', {
2187 'grit_defines': ['-D', 'enable_webrtc'], 2196 'grit_defines': ['-D', 'enable_webrtc'],
2188 }], 2197 }],
2189 ['enable_hangout_services_extension==1', { 2198 ['enable_hangout_services_extension==1', {
(...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after
2982 'defines': ['ENABLE_AUTOFILL_DIALOG=1'], 2991 'defines': ['ENABLE_AUTOFILL_DIALOG=1'],
2983 }], 2992 }],
2984 ['enable_prod_wallet_service==1', { 2993 ['enable_prod_wallet_service==1', {
2985 # In GN, this is set on the autofill tagets only. See 2994 # In GN, this is set on the autofill tagets only. See
2986 # //components/autofill/core/browser:wallet_service 2995 # //components/autofill/core/browser:wallet_service
2987 'defines': ['ENABLE_PROD_WALLET_SERVICE=1'], 2996 'defines': ['ENABLE_PROD_WALLET_SERVICE=1'],
2988 }], 2997 }],
2989 ['enable_background==1', { 2998 ['enable_background==1', {
2990 'defines': ['ENABLE_BACKGROUND=1'], 2999 'defines': ['ENABLE_BACKGROUND=1'],
2991 }], 3000 }],
3001 ['enable_google_now==1', {
3002 'defines': ['ENABLE_GOOGLE_NOW=1'],
3003 }],
2992 ['enable_basic_printing==1 or enable_print_preview==1', { 3004 ['enable_basic_printing==1 or enable_print_preview==1', {
2993 # Convenience define for ENABLE_BASIC_PRINTING || ENABLE_PRINT_PREVIEW. 3005 # Convenience define for ENABLE_BASIC_PRINTING || ENABLE_PRINT_PREVIEW.
2994 'defines': ['ENABLE_PRINTING=1'], 3006 'defines': ['ENABLE_PRINTING=1'],
2995 }], 3007 }],
2996 ['enable_basic_printing==1', { 3008 ['enable_basic_printing==1', {
2997 # Enable basic printing support and UI. 3009 # Enable basic printing support and UI.
2998 'defines': ['ENABLE_BASIC_PRINTING=1'], 3010 'defines': ['ENABLE_BASIC_PRINTING=1'],
2999 }], 3011 }],
3000 ['enable_print_preview==1', { 3012 ['enable_print_preview==1', {
3001 # Enable printing with print preview. 3013 # Enable printing with print preview.
(...skipping 3363 matching lines...) Expand 10 before | Expand all | Expand 10 after
6365 # settings in target dicts. SYMROOT is a special case, because many other 6377 # settings in target dicts. SYMROOT is a special case, because many other
6366 # Xcode variables depend on it, including variables such as 6378 # Xcode variables depend on it, including variables such as
6367 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6379 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6368 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6380 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6369 # files to appear (when present) in the UI as actual files and not red 6381 # files to appear (when present) in the UI as actual files and not red
6370 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6382 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6371 # and therefore SYMROOT, needs to be set at the project level. 6383 # and therefore SYMROOT, needs to be set at the project level.
6372 'SYMROOT': '<(DEPTH)/xcodebuild', 6384 'SYMROOT': '<(DEPTH)/xcodebuild',
6373 }, 6385 },
6374 } 6386 }
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