| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # Xcode throws an error if an iOS target depends on a Mac OS X target. So | 5 # Xcode throws an error if an iOS target depends on a Mac OS X target. So |
| 6 # any place a utility program needs to be build and run, an action is | 6 # any place a utility program needs to be build and run, an action is |
| 7 # used to run ninja as script to work around this. | 7 # used to run ninja as script to work around this. |
| 8 # Example: | 8 # Example: |
| 9 # { | 9 # { |
| 10 # 'target_name': 'foo', | 10 # 'target_name': 'foo', |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 # Don't use anything set for the iOS side of things. | 62 # Don't use anything set for the iOS side of things. |
| 63 '--ignore-environment', | 63 '--ignore-environment', |
| 64 # Generate for ninja | 64 # Generate for ninja |
| 65 '--format=ninja', | 65 '--format=ninja', |
| 66 # Generate files into xcodebuild/ninja | 66 # Generate files into xcodebuild/ninja |
| 67 '-Goutput_dir=xcodebuild/<(ninja_output_dir)', | 67 '-Goutput_dir=xcodebuild/<(ninja_output_dir)', |
| 68 # nacl isn't in the iOS checkout, make sure it's turned off | 68 # nacl isn't in the iOS checkout, make sure it's turned off |
| 69 '-Ddisable_nacl=1', | 69 '-Ddisable_nacl=1', |
| 70 # Pass through the Mac SDK version. | 70 # Pass through the Mac SDK version. |
| 71 '-Dmac_sdk=<(mac_sdk)', | 71 '-Dmac_sdk=<(mac_sdk)', |
| 72 '-Dparent_generator=<(parent_generator)' | 72 '-Dparent_generator=<(parent_generator)', |
| 73 '-DOS=mac', |
| 73 ], | 74 ], |
| 74 | 75 |
| 75 # Rerun gyp for each of the projects needed. This is what actually | 76 # Rerun gyp for each of the projects needed. This is what actually |
| 76 # generates the projects on disk. | 77 # generates the projects on disk. |
| 77 're_run_gyp_execution': | 78 're_run_gyp_execution': |
| 78 '<!(cd <(DEPTH) && <@(re_run_gyp) <@(re_run_targets))', | 79 '<!(cd <(DEPTH) && <@(re_run_gyp) <@(re_run_targets))', |
| 79 }, | 80 }, |
| 80 # Since these are used to generate things needed by other targets, make | 81 # Since these are used to generate things needed by other targets, make |
| 81 # them hard dependencies so they are always built first. | 82 # them hard dependencies so they are always built first. |
| 82 'hard_dependency': 1, | 83 'hard_dependency': 1, |
| 83 } | 84 } |
| OLD | NEW |