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

Unified Diff: build/common.gypi

Issue 9701006: Don't build the task manager into Android builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolve jam's commnents about not ifdef'ing includes Created 8 years, 9 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 | « no previous file | chrome/browser/net/chrome_network_delegate.cc » ('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 c0b770dcc43a9afaaebf4a127720cf56195d2609..86df96d4746f4afa539ddb6fac9cb9e9efb3aa89 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -234,6 +234,9 @@
# disabling depends on the platform.
'enable_themes%': 1,
+ # Enable the task manager by default.
+ 'enable_task_manager%': 1,
+
# XInput2 multitouch support is disabled by default (use_xi2_mt=0).
# Setting to non-zero value enables XI2 MT. When XI2 MT is enabled,
# the input value also defines the required XI2 minor minimum version.
@@ -504,6 +507,7 @@
'tests_run%': '<(tests_run)',
'enable_automation%': '<(enable_automation)',
'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
+ 'enable_task_manager%': '<(enable_task_manager)',
# Whether to build for Wayland display server
'use_wayland%': 0,
@@ -784,6 +788,7 @@
'use_openssl%': 1,
'proprietary_codecs%': '<(proprietary_codecs)',
+ 'enable_task_manager%': 0,
'safe_browsing%': 0,
'configuration_policy%': 0,
'input_speech%': 0,
@@ -1355,6 +1360,11 @@
'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
],
}],
+ ['enable_task_manager==1', {
+ 'defines': [
+ 'ENABLE_TASK_MANAGER=1',
+ ],
+ }],
['enable_web_intents==1', {
'defines': [
'ENABLE_WEB_INTENTS=1',
« no previous file with comments | « no previous file | chrome/browser/net/chrome_network_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698