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

Side by Side Diff: build/common.gypi

Issue 2121303003: Remove the "Settings" packaged app (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months 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 | « ash/shell/app_list.cc ('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 952 matching lines...) Expand 10 before | Expand all | Expand 10 after
963 # compositor. 963 # compositor.
964 ['OS!="android" and OS!="ios"', { 964 ['OS!="android" and OS!="ios"', {
965 'use_canvas_skia%': 1, 965 'use_canvas_skia%': 1,
966 }], 966 }],
967 967
968 ['chromeos==1', { 968 ['chromeos==1', {
969 'enable_basic_printing%': 0, 969 'enable_basic_printing%': 0,
970 'enable_print_preview%': 1, 970 'enable_print_preview%': 1,
971 }], 971 }],
972 972
973 # Do not enable the Settings App on ChromeOS.
974 ['enable_app_list==1 and chromeos==0', {
975 'enable_settings_app%': 1,
976 }, {
977 'enable_settings_app%': 0,
978 }],
979
980 # Whether tests targets should be run, archived or just have the 973 # Whether tests targets should be run, archived or just have the
981 # dependencies verified. All the tests targets have the '_run' suffix, 974 # dependencies verified. All the tests targets have the '_run' suffix,
982 # e.g. base_unittests_run runs the target base_unittests. The test 975 # e.g. base_unittests_run runs the target base_unittests. The test
983 # target always calls tools/swarming_client/isolate.py. See the script's 976 # target always calls tools/swarming_client/isolate.py. See the script's
984 # --help for more information. Meant to be overriden with GYP_DEFINES. 977 # --help for more information. Meant to be overriden with GYP_DEFINES.
985 # TODO(maruel): Remove the conditions as more configurations are 978 # TODO(maruel): Remove the conditions as more configurations are
986 # supported. 979 # supported.
987 ['OS!="ios" and OS!="android" and chromeos==0 and OS!="openbsd" and OS!= "freebsd"', { 980 ['OS!="ios" and OS!="android" and chromeos==0 and OS!="openbsd" and OS!= "freebsd"', {
988 'test_isolation_mode%': 'check', 981 'test_isolation_mode%': 'check',
989 }, { 982 }, {
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
1235 'enable_task_manager%': '<(enable_task_manager)', 1228 'enable_task_manager%': '<(enable_task_manager)',
1236 'wix_path%': '<(wix_path)', 1229 'wix_path%': '<(wix_path)',
1237 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 1230 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
1238 'use_system_libjpeg%': '<(use_system_libjpeg)', 1231 'use_system_libjpeg%': '<(use_system_libjpeg)',
1239 'android_channel%': '<(android_channel)', 1232 'android_channel%': '<(android_channel)',
1240 'icu_use_data_file_flag%': '<(icu_use_data_file_flag)', 1233 'icu_use_data_file_flag%': '<(icu_use_data_file_flag)',
1241 'gyp_managed_install%': 0, 1234 'gyp_managed_install%': 0,
1242 'create_standalone_apk%': 1, 1235 'create_standalone_apk%': 1,
1243 'enable_app_list%': '<(enable_app_list)', 1236 'enable_app_list%': '<(enable_app_list)',
1244 'use_default_render_theme%': '<(use_default_render_theme)', 1237 'use_default_render_theme%': '<(use_default_render_theme)',
1245 'enable_settings_app%': '<(enable_settings_app)',
1246 'google_api_key%': '<(google_api_key)', 1238 'google_api_key%': '<(google_api_key)',
1247 'google_default_client_id%': '<(google_default_client_id)', 1239 'google_default_client_id%': '<(google_default_client_id)',
1248 'google_default_client_secret%': '<(google_default_client_secret)', 1240 'google_default_client_secret%': '<(google_default_client_secret)',
1249 'enable_supervised_users%': '<(enable_supervised_users)', 1241 'enable_supervised_users%': '<(enable_supervised_users)',
1250 'enable_mdns%' : '<(enable_mdns)', 1242 'enable_mdns%' : '<(enable_mdns)',
1251 'enable_service_discovery%' : '<(enable_service_discovery)', 1243 'enable_service_discovery%' : '<(enable_service_discovery)',
1252 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension) ', 1244 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension) ',
1253 'proprietary_codecs%': '<(proprietary_codecs)', 1245 'proprietary_codecs%': '<(proprietary_codecs)',
1254 'use_goma%': '<(use_goma)', 1246 'use_goma%': '<(use_goma)',
1255 'gomadir%': '<(gomadir)', 1247 'gomadir%': '<(gomadir)',
(...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after
2156 }], 2148 }],
2157 ['enable_print_preview==1', { 2149 ['enable_print_preview==1', {
2158 'grit_defines': ['-D', 'enable_print_preview'], 2150 'grit_defines': ['-D', 'enable_print_preview'],
2159 }], 2151 }],
2160 ['enable_themes==1', { 2152 ['enable_themes==1', {
2161 'grit_defines': ['-D', 'enable_themes'], 2153 'grit_defines': ['-D', 'enable_themes'],
2162 }], 2154 }],
2163 ['enable_app_list==1', { 2155 ['enable_app_list==1', {
2164 'grit_defines': ['-D', 'enable_app_list'], 2156 'grit_defines': ['-D', 'enable_app_list'],
2165 }], 2157 }],
2166 ['enable_settings_app==1', {
2167 'grit_defines': ['-D', 'enable_settings_app'],
2168 }],
2169 ['use_concatenated_impulse_responses==1', { 2158 ['use_concatenated_impulse_responses==1', {
2170 'grit_defines': ['-D', 'use_concatenated_impulse_responses'], 2159 'grit_defines': ['-D', 'use_concatenated_impulse_responses'],
2171 }], 2160 }],
2172 ['enable_media_router==1', { 2161 ['enable_media_router==1', {
2173 'grit_defines': ['-D', 'enable_media_router'], 2162 'grit_defines': ['-D', 'enable_media_router'],
2174 }], 2163 }],
2175 ['enable_webrtc==1', { 2164 ['enable_webrtc==1', {
2176 'grit_defines': ['-D', 'enable_webrtc'], 2165 'grit_defines': ['-D', 'enable_webrtc'],
2177 }], 2166 }],
2178 ['enable_hangout_services_extension==1', { 2167 ['enable_hangout_services_extension==1', {
(...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after
2940 }], 2929 }],
2941 ['use_browser_spellchecker', { 2930 ['use_browser_spellchecker', {
2942 'defines': ['USE_BROWSER_SPELLCHECKER=1'], 2931 'defines': ['USE_BROWSER_SPELLCHECKER=1'],
2943 }], 2932 }],
2944 ['enable_captive_portal_detection==1', { 2933 ['enable_captive_portal_detection==1', {
2945 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'], 2934 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'],
2946 }], 2935 }],
2947 ['enable_app_list==1', { 2936 ['enable_app_list==1', {
2948 'defines': ['ENABLE_APP_LIST=1'], 2937 'defines': ['ENABLE_APP_LIST=1'],
2949 }], 2938 }],
2950 ['enable_settings_app==1', {
2951 'defines': ['ENABLE_SETTINGS_APP=1'],
2952 }],
2953 ['disable_file_support==1', { 2939 ['disable_file_support==1', {
2954 'defines': ['DISABLE_FILE_SUPPORT=1'], 2940 'defines': ['DISABLE_FILE_SUPPORT=1'],
2955 }], 2941 }],
2956 ['disable_ftp_support==1', { 2942 ['disable_ftp_support==1', {
2957 'defines': ['DISABLE_FTP_SUPPORT=1'], 2943 'defines': ['DISABLE_FTP_SUPPORT=1'],
2958 }], 2944 }],
2959 ['enable_supervised_users==1', { 2945 ['enable_supervised_users==1', {
2960 'defines': ['ENABLE_SUPERVISED_USERS=1'], 2946 'defines': ['ENABLE_SUPERVISED_USERS=1'],
2961 }], 2947 }],
2962 ['enable_mdns==1', { 2948 ['enable_mdns==1', {
(...skipping 3359 matching lines...) Expand 10 before | Expand all | Expand 10 after
6322 # settings in target dicts. SYMROOT is a special case, because many other 6308 # settings in target dicts. SYMROOT is a special case, because many other
6323 # Xcode variables depend on it, including variables such as 6309 # Xcode variables depend on it, including variables such as
6324 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6310 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6325 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6311 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6326 # files to appear (when present) in the UI as actual files and not red 6312 # files to appear (when present) in the UI as actual files and not red
6327 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6313 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6328 # and therefore SYMROOT, needs to be set at the project level. 6314 # and therefore SYMROOT, needs to be set at the project level.
6329 'SYMROOT': '<(DEPTH)/xcodebuild', 6315 'SYMROOT': '<(DEPTH)/xcodebuild',
6330 }, 6316 },
6331 } 6317 }
OLDNEW
« no previous file with comments | « ash/shell/app_list.cc ('k') | build/config/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698