Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(432)

Side by Side Diff: build/ios/mac_build.gypi

Issue 14577007: Gyp changes for ninja iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: set generator inside mac_build Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/common.gypi ('k') | build/landmines.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 21 matching lines...) Expand all
32 # '<@(ninja_cmd)', 32 # '<@(ninja_cmd)',
33 # # All the targets to build. 33 # # All the targets to build.
34 # 'foo1', 34 # 'foo1',
35 # 'foo2', 35 # 'foo2',
36 # ], 36 # ],
37 # }, 37 # },
38 # ], 38 # ],
39 # } 39 # }
40 { 40 {
41 'variables': { 41 'variables': {
42 'variables': {
43 'parent_generator%': '<(GENERATOR)',
44 },
45 'parent_generator%': '<(parent_generator)',
42 # Common ninja command line flags. 46 # Common ninja command line flags.
43 'ninja_cmd': [ 47 'ninja_cmd': [
44 # Bounce through clean_env to clean up the environment so things 48 # Bounce through clean_env to clean up the environment so things
45 # set by the iOS build don't pollute the Mac build. 49 # set by the iOS build don't pollute the Mac build.
46 '<(DEPTH)/build/ios/clean_env.py', 50 '<(DEPTH)/build/ios/clean_env.py',
47 # ninja must be found in the PATH. 51 # ninja must be found in the PATH.
48 'ADD_TO_PATH=<!(echo $PATH)', 52 'ADD_TO_PATH=<!(echo $PATH)',
49 'ninja', 53 'ninja',
50 '-C', 54 '-C',
51 '<(ninja_product_dir)', 55 '<(ninja_product_dir)',
52 ], 56 ],
53 57
54 # Common syntax to rerun gyp to generate the Mac projects. 58 # Common syntax to rerun gyp to generate the Mac projects.
55 're_run_gyp': [ 59 're_run_gyp': [
56 'build/gyp_chromium', 60 'build/gyp_chromium',
57 '--depth=.', 61 '--depth=.',
58 # Don't use anything set for the iOS side of things. 62 # Don't use anything set for the iOS side of things.
59 '--ignore-environment', 63 '--ignore-environment',
60 # Generate for ninja 64 # Generate for ninja
61 '--format=ninja', 65 '--format=ninja',
62 # Generate files into xcodebuild/ninja 66 # Generate files into xcodebuild/ninja
63 '-Goutput_dir=xcodebuild/<(ninja_output_dir)', 67 '-Goutput_dir=xcodebuild/<(ninja_output_dir)',
64 # 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
65 '-Ddisable_nacl=1', 69 '-Ddisable_nacl=1',
66 # Add a variable to handle specific cases for mac_build. 70 # Add a variable to handle specific cases for mac_build.
67 '-Dios_mac_build=1', 71 '-Dios_mac_build=1',
68 # Pass through the Mac SDK version. 72 # Pass through the Mac SDK version.
69 '-Dmac_sdk=<(mac_sdk)', 73 '-Dmac_sdk=<(mac_sdk)',
74 '-Dparent_generator=<(parent_generator)'
70 ], 75 ],
71 76
72 # Rerun gyp for each of the projects needed. This is what actually 77 # Rerun gyp for each of the projects needed. This is what actually
73 # generates the projects on disk. 78 # generates the projects on disk.
74 're_run_gyp_execution': 79 're_run_gyp_execution':
75 '<!(cd <(DEPTH) && <@(re_run_gyp) <@(re_run_targets))', 80 '<!(cd <(DEPTH) && <@(re_run_gyp) <@(re_run_targets))',
76 }, 81 },
77 # Since these are used to generate things needed by other targets, make 82 # Since these are used to generate things needed by other targets, make
78 # them hard dependencies so they are always built first. 83 # them hard dependencies so they are always built first.
79 'hard_dependency': 1, 84 'hard_dependency': 1,
80 } 85 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | build/landmines.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698