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

Unified Diff: build/common.gypi

Issue 11428167: Disable the settings app by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | 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 9e90c3a14b7d67421a4d446eb4aa2f4b854af983..c9fa7dac46a854eb7f8c10c5e524fd9ac6343322 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -407,6 +407,8 @@
'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
'wix_path%': '<(DEPTH)/third_party/wix',
+ 'enable_settings_app%': 0,
+
'conditions': [
# TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
# the 'conditions' clause. Initial attempts resulted in chromium and
@@ -572,13 +574,6 @@
# where possible to reduce ROM size.
'use_system_libjpeg%': '<(android_build_type)',
}],
-
- # Enable Settings App only on Windows.
- ['enable_app_list==1 and OS=="win"', {
- 'enable_settings_app%': 1,
- }, {
- 'enable_settings_app%': 0,
- }],
],
# Set this to 1 to use the Google-internal file containing
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698