diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-28 02:11:24 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-28 02:11:24 +0000 |
| commit | 0c952a797b43569c8a6bda833d643b5823d8bdc8 (patch) | |
| tree | ce763169fc674675a3b86735cb472bf8d1e0a7d6 /build | |
| parent | a106f60fcb22ead7a644e9ba9dac0eb38be57e05 (diff) | |
| download | chromium_src-0c952a797b43569c8a6bda833d643b5823d8bdc8.zip chromium_src-0c952a797b43569c8a6bda833d643b5823d8bdc8.tar.gz chromium_src-0c952a797b43569c8a6bda833d643b5823d8bdc8.tar.bz2 | |
Invoke grit_info as a python module.
This speeds up build/gyp_chromium by 7s on my system (for a total of 10s with the other grit_info changes I landed earlier).
BUG=82230
TEST=none
Review URL: http://codereview.chromium.org/7035004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/grit_action.gypi | 6 | ||||
| -rwxr-xr-x | build/gyp_chromium | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/build/grit_action.gypi b/build/grit_action.gypi index 041d704..ead9020 100644 --- a/build/grit_action.gypi +++ b/build/grit_action.gypi @@ -15,15 +15,13 @@ { 'variables': { - 'grit_info_cmd': ['python', '<(DEPTH)/tools/grit/grit_info.py', - '<@(grit_defines)'], 'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'], }, 'inputs': [ - '<!@(<(grit_info_cmd) --inputs <(grit_grd_file))', + '<!@pymod_do_main(grit_info <@(grit_defines) --inputs <(grit_grd_file))', ], 'outputs': [ - '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(grit_grd_file))', + '<!@pymod_do_main(grit_info <@(grit_defines) --outputs \'<(grit_out_dir)\' <(grit_grd_file))', ], 'action': ['<@(grit_cmd)', '-i', '<(grit_grd_file)', 'build', diff --git a/build/gyp_chromium b/build/gyp_chromium index 3cddef6..18e7d65 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -19,6 +19,10 @@ chrome_src = os.path.abspath(os.path.join(script_dir, os.pardir)) sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib')) import gyp +# Add tools/grit so that pymod_do_main(grit_info ...) can find grit_info.py. +sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit')) + + # On Windows, Psyco shortens warm runs of build/gyp_chromium by about # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70 # seconds. Conversely, memory usage of build/gyp_chromium with Psyco |