Commit f199af76 authored by lliabraa@chromium.org's avatar lliabraa@chromium.org

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
parent 1345310e
...@@ -56,17 +56,9 @@ ...@@ -56,17 +56,9 @@
'ninja_product_dir': 'ninja_product_dir':
'<(DEPTH)/xcodebuild/<(ninja_output_dir)/<(CONFIGURATION_NAME)', '<(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': [ 'targets': [
{ {
'target_name': 'compile_iossim', 'target_name': 'iossim',
'type': 'none', 'type': 'none',
'variables': { 'variables': {
# Gyp to rerun # Gyp to rerun
...@@ -88,31 +80,6 @@ ...@@ -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',
],
},
],
},
], ],
}, },
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment