Index: breakpad/breakpad.gyp |
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp |
index b121ceda1bb21f2edd47c0f3c0cc8f07dacd0e6d..e8114f440530cb1c0d0009e02be1b53ec07c6d9e 100644 |
--- a/breakpad/breakpad.gyp |
+++ b/breakpad/breakpad.gyp |
@@ -718,12 +718,24 @@ |
], |
}], |
[ 'OS=="ios"', { |
+ 'variables': { |
+ 'ninja_output_dir': 'ninja-breakpad', |
+ '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': 'breakpad_utilities', |
+ 'target_name': 'compile_breakpad_utilities', |
'type': 'none', |
'variables': { |
- 'ninja_output_dir': 'ninja-breakpad', |
# Gyp to rerun |
're_run_targets': [ |
'breakpad/breakpad.gyp', |
@@ -742,6 +754,15 @@ |
], |
'message': 'Generating the breakpad executables', |
}, |
+ ], |
+ }, |
+ { |
+ 'target_name': 'breakpad_utilities', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'compile_breakpad_utilities', |
+ ], |
+ 'actions': [ |
{ |
'action_name': 'copy dump_syms', |
'inputs': [ |