From f199af76ea8f2a1c9f600713b5b71793c4a50ed9 Mon Sep 17 00:00:00 2001
From: "lliabraa@chromium.org"
 <lliabraa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 19 Apr 2013 17:50:58 +0000
Subject: 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
---
 testing/iossim/iossim.gyp | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

(limited to 'testing/iossim')

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',
-                ],
-              },
-            ],
-          },
         ],
       },
     ],
-- 
cgit v1.1