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

Unified Diff: chrome/chrome_tests.gypi

Issue 33193002: Delete pyautolib target for all platforms except linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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/tools/build/linux/TESTS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 509281ebb231c35765098749ed2b048427d2f9c7..04746587e3df9ac6352c6223691c25f8418d07f9 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2611,9 +2611,10 @@
},
{
# Documentation: http://dev.chromium.org/developers/testing/pyauto
+ # Deprecated. Do not add additional dependencies.
'target_name': 'pyautolib',
'conditions': [
- ['enable_automation==1 and (OS=="mac" or ((OS=="win" or os_posix==1) and target_arch==python_arch))', {
+ ['enable_automation==1 and OS=="linux" and target_arch==python_arch', {
'type': 'loadable_module',
'product_prefix': '_',
'dependencies': [
@@ -2632,7 +2633,13 @@
],
'include_dirs': [
'..',
+ '<(sysroot)/usr/include/python<(python_ver)',
],
+ 'link_settings': {
+ 'libraries': [
+ '-lpython<(python_ver)',
+ ],
+ },
'cflags': [
'-Wno-uninitialized',
'-Wno-self-assign', # to keep clang happy for generated code.
@@ -2649,69 +2656,21 @@
'<(INTERMEDIATE_DIR)/pyautolib_wrap.cc',
'<@(pyautolib_sources)',
],
- 'xcode_settings': {
- # Link with python2.6. Using -L/usr/lib and -lpython2.6 does not
- # work with the -isysroot argument passed in. Even if it did,
- # the linker shouldn't use any other lib not in the 10.5 sdk.
- 'OTHER_LDFLAGS': [
- '/usr/lib/libpython2.6.dylib'
- ],
- 'WARNING_CFLAGS': [
- # swig creates code with self assignments.
- '-Wno-self-assign',
- ],
- },
- 'msvs_disabled_warnings': [4211],
'conditions': [
# Disable the type profiler. _POSIX_C_SOURCE and _XOPEN_SOURCE
# conflict between <Python.h> and <typeinfo>.
- ['OS=="linux" and clang_type_profiler==1', {
+ ['clang_type_profiler==1', {
'cflags_cc!': [
'-fintercept-allocation-functions',
],
}],
- ['os_posix == 1 and OS!="mac"', {
- 'include_dirs': [
- '..',
- '<(sysroot)/usr/include/python<(python_ver)',
- ],
- 'link_settings': {
- 'libraries': [
- '-lpython<(python_ver)',
- ],
- },
- }],
['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
],
}],
- ['OS=="mac"', {
- 'include_dirs': [
- '..',
- '/usr/include/python2.6',
- ],
- }],
- ['OS=="win"', {
- 'product_extension': 'pyd',
- 'include_dirs': [
- '..',
- '../third_party/python_26/include',
- ],
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalLibraryDirectories': [
- '<(DEPTH)/third_party/python_26/libs',
- ],
- 'AdditionalDependencies': [
- 'python26.lib',
- ],
- },
- }
- }],
['asan==1', {
'cflags!': [ '-fsanitize=address' ],
- 'xcode_settings': { 'OTHER_CFLAGS!': [ '-fsanitize=address' ] },
}],
],
'actions': [
« no previous file with comments | « no previous file | chrome/tools/build/linux/TESTS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698