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

Side by Side Diff: build/common.gypi

Issue 66303010: Enables goma from GYP. (Closed) Base URL: http://src.chromium.org/native_client/trunk/src/native_client/
Patch Set: Created 7 years 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/build_nexe.py ('k') | build/untrusted.gypi » ('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 { 5 {
6 'variables': { 6 'variables': {
7 # .gyp files should set chromium_code to 1 if they build Chromium-specific 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific
8 # code, as opposed to external code. This variable is used to control 8 # code, as opposed to external code. This variable is used to control
9 # such things as the set of warnings to enable, and whether warnings are 9 # such things as the set of warnings to enable, and whether warnings are
10 # treated as errors. 10 # treated as errors.
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 # Override buildtype to select the desired build flavor. 79 # Override buildtype to select the desired build flavor.
80 # Dev - everyday build for development/testing 80 # Dev - everyday build for development/testing
81 # Official - release build (generally implies additional processing) 81 # Official - release build (generally implies additional processing)
82 # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp 82 # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
83 # conversion is done), some of the things which are now controlled by 83 # conversion is done), some of the things which are now controlled by
84 # 'branding', such as symbol generation, will need to be refactored 84 # 'branding', such as symbol generation, will need to be refactored
85 # based on 'buildtype' (i.e. we don't care about saving symbols for 85 # based on 'buildtype' (i.e. we don't care about saving symbols for
86 # non-Official builds). 86 # non-Official builds).
87 'buildtype%': 'Dev', 87 'buildtype%': 'Dev',
88 88
89 # goma settings.
90 'use_goma%': 0,
91 'gomadir%': '',
92
89 'conditions': [ 93 'conditions': [
90 # Compute the architecture that we're building for. Default to the 94 # Compute the architecture that we're building for. Default to the
91 # architecture that we're building on. 95 # architecture that we're building on.
92 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 96 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
93 # This handles the Linux platforms we generally deal with. Anything 97 # This handles the Linux platforms we generally deal with. Anything
94 # else gets passed through, which probably won't work very well; 98 # else gets passed through, which probably won't work very well;
95 # such hosts should pass an explicit target_arch to gyp. 99 # such hosts should pass an explicit target_arch to gyp.
96 # 100 #
97 # NOTE: currently only nacl is generating gyp files on an arm board. 101 # NOTE: currently only nacl is generating gyp files on an arm board.
98 # The arm.* -> arm substitution in chrome's common.gypi isn't 102 # The arm.* -> arm substitution in chrome's common.gypi isn't
99 # appropriate in that context as we actually use target_arch==arm 103 # appropriate in that context as we actually use target_arch==arm
100 # to me x86 -> arm cross compile. When actually running on an arm 104 # to me x86 -> arm cross compile. When actually running on an arm
101 # board, we'll generate ia32 for now, so that the generation 105 # board, we'll generate ia32 for now, so that the generation
102 # succeeds. 106 # succeeds.
103 'target_arch%': 107 'target_arch%':
104 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/ia32/")' 108 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/ia32/")'
105 }, { # OS!="linux" 109 }, { # OS!="linux"
106 'target_arch%': 'ia32', 110 'target_arch%': 'ia32',
107 }], 111 }],
108 ] 112 ]
109 }, 113 },
110 # These come from the above variable scope. 114 # These come from the above variable scope.
111 'nacl_standalone%': '<(nacl_standalone)', 115 'nacl_standalone%': '<(nacl_standalone)',
112 'target_arch%': '<(target_arch)', 116 'target_arch%': '<(target_arch)',
113 'branding%': '<(branding)', 117 'branding%': '<(branding)',
114 'buildtype%': '<(buildtype)', 118 'buildtype%': '<(buildtype)',
119 'use_goma%': '<(use_goma)',
120 'gomadir%': '<(gomadir)',
115 121
116 'conditions': [ 122 'conditions': [
117 # The system root for cross-compiles. Default: none. 123 # The system root for cross-compiles. Default: none.
118 # If we are building in chrome we want to rely on chrome's default, whic h 124 # If we are building in chrome we want to rely on chrome's default, whic h
119 # means we can't set a default here. 125 # means we can't set a default here.
120 ['nacl_standalone!=0', { 126 ['nacl_standalone!=0', {
121 'sysroot%': '', 127 'sysroot%': '',
122 }], 128 }],
123 ], 129 ],
124 130
125 # This variable is to allow us to build components as either static 131 # This variable is to allow us to build components as either static
126 # libraries or dynamic shared libraries. 132 # libraries or dynamic shared libraries.
127 'component%': 'static_library', 133 'component%': 'static_library',
128 }, 134 },
129 # These come from the above variable scope. 135 # These come from the above variable scope.
130 'target_arch%': '<(target_arch)', 136 'target_arch%': '<(target_arch)',
131 'sysroot%': '<(sysroot)', 137 'sysroot%': '<(sysroot)',
132 'nacl_standalone%': '<(nacl_standalone)', 138 'nacl_standalone%': '<(nacl_standalone)',
133 'branding%': '<(branding)', 139 'branding%': '<(branding)',
134 'buildtype%': '<(buildtype)', 140 'buildtype%': '<(buildtype)',
135 'component%': '<(component)', 141 'component%': '<(component)',
142 'use_goma%': '<(use_goma)',
143 'gomadir%': '<(gomadir)',
136 144
137 'nacl_strict_warnings%': 1, 145 'nacl_strict_warnings%': 1,
138 'nacl_validator_ragel%': 1, 146 'nacl_validator_ragel%': 1,
139 147
140 'linux2%': 0, 148 'linux2%': 0,
141 }, 149 },
142 150
143 'target_defaults': { 151 'target_defaults': {
144 'include_dirs': [ 152 'include_dirs': [
145 # Putting this first so that people who include "ppapi/..." get the 153 # Putting this first so that people who include "ppapi/..." get the
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 783 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
776 # files to appear (when present) in the UI as actual files and not red 784 # files to appear (when present) in the UI as actual files and not red
777 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 785 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
778 # and therefore SYMROOT, needs to be set at the project level. 786 # and therefore SYMROOT, needs to be set at the project level.
779 'SYMROOT': '<(DEPTH)/xcodebuild', 787 'SYMROOT': '<(DEPTH)/xcodebuild',
780 }, 788 },
781 'includes': [ 789 'includes': [
782 'untrusted.gypi', 790 'untrusted.gypi',
783 ], 791 ],
784 } 792 }
OLDNEW
« no previous file with comments | « build/build_nexe.py ('k') | build/untrusted.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698