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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell/app_list.cc ('k') | build/config/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 7120836c637e8683adddc516c84a9f7cc9ae7a6e..7dace7be52c07d918f1268559cb8789d9dc0466e 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -970,13 +970,6 @@
'enable_print_preview%': 1,
}],
- # Do not enable the Settings App on ChromeOS.
- ['enable_app_list==1 and chromeos==0', {
- 'enable_settings_app%': 1,
- }, {
- 'enable_settings_app%': 0,
- }],
-
# Whether tests targets should be run, archived or just have the
# dependencies verified. All the tests targets have the '_run' suffix,
# e.g. base_unittests_run runs the target base_unittests. The test
@@ -1242,7 +1235,6 @@
'create_standalone_apk%': 1,
'enable_app_list%': '<(enable_app_list)',
'use_default_render_theme%': '<(use_default_render_theme)',
- 'enable_settings_app%': '<(enable_settings_app)',
'google_api_key%': '<(google_api_key)',
'google_default_client_id%': '<(google_default_client_id)',
'google_default_client_secret%': '<(google_default_client_secret)',
@@ -2163,9 +2155,6 @@
['enable_app_list==1', {
'grit_defines': ['-D', 'enable_app_list'],
}],
- ['enable_settings_app==1', {
- 'grit_defines': ['-D', 'enable_settings_app'],
- }],
['use_concatenated_impulse_responses==1', {
'grit_defines': ['-D', 'use_concatenated_impulse_responses'],
}],
@@ -2947,9 +2936,6 @@
['enable_app_list==1', {
'defines': ['ENABLE_APP_LIST=1'],
}],
- ['enable_settings_app==1', {
- 'defines': ['ENABLE_SETTINGS_APP=1'],
- }],
['disable_file_support==1', {
'defines': ['DISABLE_FILE_SUPPORT=1'],
}],
« 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