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: http://src.chromium.org/svn/trunk/src/build@127004 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
7ed7dafb35
Коммит
7045689c39
2
all.gyp
2
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',
|
||||
],
|
||||
|
|
11
common.gypi
11
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', {
|
||||
|
|
Загрузка…
Ссылка в новой задаче