diff options
| author | lliabraa@chromium.org <lliabraa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 17:50:58 +0000 |
|---|---|---|
| committer | lliabraa@chromium.org <lliabraa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 17:50:58 +0000 |
| commit | f199af76ea8f2a1c9f600713b5b71793c4a50ed9 (patch) | |
| tree | 7eaee0f00bd8d958129ac124c2acfd5fbe5e17da /testing/iossim | |
| parent | 1345310e895137b8f25e64fd00e81ac60cb42f88 (diff) | |
| download | chromium_src-f199af76ea8f2a1c9f600713b5b71793c4a50ed9.zip chromium_src-f199af76ea8f2a1c9f600713b5b71793c4a50ed9.tar.gz chromium_src-f199af76ea8f2a1c9f600713b5b71793c4a50ed9.tar.bz2 | |
Don't copy iossim after compilation.
The scripts that were relying on the post-copy location are being updated to
use the pre-copy location.
BUG=228157
Review URL: https://chromiumcodereview.appspot.com/14295006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/iossim')
| -rw-r--r-- | testing/iossim/iossim.gyp | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/testing/iossim/iossim.gyp b/testing/iossim/iossim.gyp index 45601f4..e75579d 100644 --- a/testing/iossim/iossim.gyp +++ b/testing/iossim/iossim.gyp @@ -56,17 +56,9 @@ 'ninja_product_dir': '<(DEPTH)/xcodebuild/<(ninja_output_dir)/<(CONFIGURATION_NAME)', }, - # Generation is done via two actions: (1) compiling the executable with - # ninja, and (2) copying the executable into a location that is shared - # with other projects. These actions are separated into two targets in - # order to be able to specify that the second action should not run - # until the first action finishes (since the ordering of multiple - # actions in one target is defined only by inputs and outputs, and it's - # impossible to set correct inputs for the ninja build, so setting all - # the inputs and outputs isn't an option). 'targets': [ { - 'target_name': 'compile_iossim', + 'target_name': 'iossim', 'type': 'none', 'variables': { # Gyp to rerun @@ -88,31 +80,6 @@ }, ], }, - { - 'target_name': 'iossim', - 'type': 'none', - 'dependencies': [ - 'compile_iossim', - ], - 'actions': [ - { - 'action_name': 'copy iossim', - 'inputs': [ - # TODO(ios): It should be possible to define the input, but - # adding it causes gyp to complain about duplicate id. - # '<(ninja_product_dir)/iossim', - ], - 'outputs': [ - '<(DEPTH)/xcodebuild/<(CONFIGURATION_NAME)/iossim', - ], - 'action': [ - 'cp', - '<(ninja_product_dir)/iossim', - '<(DEPTH)/xcodebuild/<(CONFIGURATION_NAME)/iossim', - ], - }, - ], - }, ], }, ], |