diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 21:53:10 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 21:53:10 +0000 |
| commit | 2e22e2ff071f9f4d770d313bf635cfa79739b847 (patch) | |
| tree | e5c366a1ef95cb9c682ee04b3aa2edcd6b86cb36 /build | |
| parent | 7eef58b5f8d3f9d30507761e7faf2a7b5e226285 (diff) | |
| download | chromium_src-2e22e2ff071f9f4d770d313bf635cfa79739b847.zip chromium_src-2e22e2ff071f9f4d770d313bf635cfa79739b847.tar.gz chromium_src-2e22e2ff071f9f4d770d313bf635cfa79739b847.tar.bz2 | |
Add enable_automation build switch.
It's only disabled on Android to exclude automation from Android build.
enable_automation=0 still doesn't work on platforms other than Android.
BUG=117407
TEST=none
Review URL: http://codereview.chromium.org/9696049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/common.gypi | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index 5984b98..e0fb1ff 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -272,7 +272,7 @@ 'conditions': [ # If you change this condition, make sure you also change it # in chrome_tests.gypi - ['OS=="mac" or OS=="win" or (os_posix==1 and OS != "android" and target_arch==python_arch)', { + ['enable_automation==1 and (OS=="mac" or OS=="win" or (os_posix==1 and target_arch==python_arch))', { 'dependencies': [ '../chrome/chrome.gyp:pyautolib', ], diff --git a/build/common.gypi b/build/common.gypi index 702a1fd..6b3dc70 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -429,6 +429,13 @@ }, { 'linux_use_gold_flags%': 0, }], + + # Enable automation on platforms other than Android. + ['OS=="android"', { + 'enable_automation%': 0, + }, { + 'enable_automation%': 1, + }], ], }, @@ -495,6 +502,7 @@ 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 'use_canvas_skia_skia%': '<(use_canvas_skia_skia)', 'tests_run%': '<(tests_run)', + 'enable_automation%': '<(enable_automation)', # Whether to build for Wayland display server 'use_wayland%': 0, @@ -1359,6 +1367,9 @@ ['enable_themes==1', { 'defines': ['ENABLE_THEMES=1'], }], + ['enable_automation==1', { + 'defines': ['ENABLE_AUTOMATION=1'], + }], ], # conditions for 'target_defaults' 'target_conditions': [ ['enable_wexit_time_destructors==1', { |