diff options
| author | jgreenwald@chromium.org <jgreenwald@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-06 01:11:02 +0000 |
|---|---|---|
| committer | jgreenwald@chromium.org <jgreenwald@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-06 01:11:02 +0000 |
| commit | 44879edeafb170c72ba93fc6dc274c442d4eacb2 (patch) | |
| tree | 5dcab6b2b0c526d78a6208dbd77f4c8770e700cf /build | |
| parent | 8dd709fbd442edc7d72d9fa092a84eabf3057bf1 (diff) | |
| download | chromium_src-44879edeafb170c72ba93fc6dc274c442d4eacb2.zip chromium_src-44879edeafb170c72ba93fc6dc274c442d4eacb2.tar.gz chromium_src-44879edeafb170c72ba93fc6dc274c442d4eacb2.tar.bz2 | |
Don't build the task manager into Android builds.
BUG=117407
Review URL: http://codereview.chromium.org/9701006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 7956ec2..10105c8 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -241,6 +241,9 @@ # Enables support for background apps. 'enable_background%': 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. @@ -513,6 +516,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, @@ -789,6 +793,7 @@ 'use_openssl%': 1, 'proprietary_codecs%': '<(proprietary_codecs)', + 'enable_task_manager%': 0, 'safe_browsing%': 0, 'configuration_policy%': 0, 'input_speech%': 0, @@ -1361,6 +1366,11 @@ 'ENABLE_REGISTER_PROTOCOL_HANDLER=1', ], }], + ['enable_task_manager==1', { + 'defines': [ + 'ENABLE_TASK_MANAGER=1', + ], + }], ['enable_web_intents==1', { 'defines': [ 'ENABLE_WEB_INTENTS=1', |