summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-13 00:20:56 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-13 00:20:56 +0000
commit84d7a3e98f88c3dfca0b3d70dfcf9c9c58d87110 (patch)
treef44d9ad5cb94ab4bd1cdcece9a40b2441679a15e /chrome
parent634020f290f2fe0cefe88ea7e1399eecfab3d10b (diff)
downloadchromium_src-84d7a3e98f88c3dfca0b3d70dfcf9c9c58d87110.zip
chromium_src-84d7a3e98f88c3dfca0b3d70dfcf9c9c58d87110.tar.gz
chromium_src-84d7a3e98f88c3dfca0b3d70dfcf9c9c58d87110.tar.bz2
Fix dependencies for pyauto.
The swig action should depend on the headers it includes. Review URL: http://codereview.chromium.org/1646002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome_tests.gypi22
-rw-r--r--chrome/test/pyautolib/pyautolib.i3
2 files changed, 19 insertions, 6 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 1d74d00..5c5f7d8 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -28,6 +28,16 @@
'../views/controls/table/table_view_unittest.cc',
'../views/grid_layout_unittest.cc',
],
+ 'pyautolib_sources': [
+ 'app/chrome_dll_resource.h',
+ 'common/pref_names.cc',
+ 'common/pref_names.h',
+ 'test/automation/automation_constants.h',
+ 'test/automation/browser_proxy.cc',
+ 'test/automation/browser_proxy.h',
+ 'test/automation/tab_proxy.cc',
+ 'test/automation/tab_proxy.h',
+ ],
},
'targets': [
{
@@ -2042,16 +2052,14 @@
'-Wno-uninitialized',
],
'sources': [
- 'app/chrome_dll_resource.h',
- 'common/pref_names.cc',
- 'common/pref_names.h',
'test/pyautolib/pyautolib.cc',
'test/pyautolib/pyautolib.h',
- '<(INTERMEDIATE_DIR)/pyautolib_wrap.cc',
'test/ui/ui_test.cc',
'test/ui/ui_test.h',
'test/ui/ui_test_suite.cc',
'test/ui/ui_test_suite.h',
+ '<(INTERMEDIATE_DIR)/pyautolib_wrap.cc',
+ '<@(pyautolib_sources)',
],
'xcode_settings': {
# Need a shared object named _pyautolib.so (not libpyautolib.dylib
@@ -2106,7 +2114,9 @@
{
'action_name': 'pyautolib_swig',
'inputs': [
+ 'test/pyautolib/argc_argv.i',
'test/pyautolib/pyautolib.i',
+ '<@(pyautolib_sources)',
],
'outputs': [
'<(INTERMEDIATE_DIR)/pyautolib_wrap.cc',
@@ -2121,9 +2131,9 @@
'<(PRODUCT_DIR)',
'-o',
'<(INTERMEDIATE_DIR)/pyautolib_wrap.cc',
- '<@(_inputs)',
+ 'test/pyautolib/pyautolib.i',
],
- 'message': 'Generating swig wrappers for <(_inputs).',
+ 'message': 'Generating swig wrappers for pyautolib.',
},
], # actions
}, # target 'pyautolib'
diff --git a/chrome/test/pyautolib/pyautolib.i b/chrome/test/pyautolib/pyautolib.i
index 407aafc..885bea8 100644
--- a/chrome/test/pyautolib/pyautolib.i
+++ b/chrome/test/pyautolib/pyautolib.i
@@ -22,6 +22,9 @@
%include "chrome/test/pyautolib/argc_argv.i"
+// NOTE: All files included in this file should also be listed under
+// pyautolib_sources in chrome_tests.gypi.
+
// Headers that can be swigged directly.
%include "chrome/app/chrome_dll_resource.h"
%include "chrome/common/pref_names.h"