diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 05:28:06 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 05:28:06 +0000 |
| commit | 998e51f6531af4f086aaaf5a43373f06b8dbcbe5 (patch) | |
| tree | 1bda6def7e69d4adeb0d57219ab59325974389e2 /app/app.gyp | |
| parent | 1958e0ef0fe59e392cab9bb351401beeb64e8379 (diff) | |
| download | chromium_src-998e51f6531af4f086aaaf5a43373f06b8dbcbe5.zip chromium_src-998e51f6531af4f086aaaf5a43373f06b8dbcbe5.tar.gz chromium_src-998e51f6531af4f086aaaf5a43373f06b8dbcbe5.tar.bz2 | |
Remove app.gyp dependency on chrome.gyp.
The problem is that app_unittests tries to use pak files generated
by chrome.gyp. Instead, create new .pak files in app_unittest_strings
and have app_unittests use those pak files instead.
Review URL: http://codereview.chromium.org/1748004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45294 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/app.gyp')
| -rw-r--r-- | app/app.gyp | 43 |
1 files changed, 41 insertions, 2 deletions
diff --git a/app/app.gyp b/app/app.gyp index 86afe36..893af8d 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -58,10 +58,10 @@ '..', ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 'dependencies': [ + 'app_unittest_strings', '../build/linux/system.gyp:gtk', - '../chrome/chrome.gyp:packed_resources', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], @@ -157,6 +157,45 @@ ], }, ], + 'conditions': [ + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + 'targets': [{ + 'target_name': 'app_unittest_strings', + 'type': 'none', + 'variables': { + 'repack_path': '<(DEPTH)/tools/data_pack/repack.py', + }, + 'actions': [ + { + 'action_name': 'repack_app_unittest_strings', + 'variables': { + 'pak_inputs': [ + '<(grit_out_dir)/app_strings/app_strings_en-US.pak', + '<(grit_out_dir)/app_locale_settings/app_locale_settings_en-US.pak', + ], + }, + 'inputs': [ + '<(repack_path)', + '<@(pak_inputs)', + ], + 'outputs': [ + '<(PRODUCT_DIR)/app_unittests_strings/en-US.pak', + ], + 'action': ['python', '<(repack_path)', '<@(_outputs)', + '<@(pak_inputs)'], + }, + ], + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/app_unittests_strings', + 'files': [ + '<(grit_out_dir)/app_resources/app_resources.pak', + ], + }, + ], + }], + }], + ], } # Local Variables: |