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

Side by Side Diff: build/common.gypi

Issue 1141003002: Move linux sysroots from chrome/installer/linux to build/linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | « DEPS ('k') | build/config/sysroot.gni » ('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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 ], 283 ],
284 }], 284 }],
285 285
286 ['target_arch=="mipsel"', { 286 ['target_arch=="mipsel"', {
287 'mips_arch_variant%': 'r1', 287 'mips_arch_variant%': 'r1',
288 }], 288 }],
289 289
290 ['OS=="linux" and target_arch=="arm" and chromeos==0', { 290 ['OS=="linux" and target_arch=="arm" and chromeos==0', {
291 # sysroot needs to be an absolute path otherwise it generates 291 # sysroot needs to be an absolute path otherwise it generates
292 # incorrect results when passed to pkg-config 292 # incorrect results when passed to pkg-config
293 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian _wheezy_arm-sysroot', 293 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy_arm -sysroot',
294 }], # OS=="linux" and target_arch=="arm" and chromeos==0 294 }], # OS=="linux" and target_arch=="arm" and chromeos==0
295 295
296 ['OS=="linux" and ((branding=="Chrome" and buildtype=="Official" and c hromeos==0) or use_sysroot==1)' , { 296 ['OS=="linux" and ((branding=="Chrome" and buildtype=="Official" and c hromeos==0) or use_sysroot==1)' , {
297 'conditions': [ 297 'conditions': [
298 ['target_arch=="x64"', { 298 ['target_arch=="x64"', {
299 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/de bian_wheezy_amd64-sysroot', 299 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy _amd64-sysroot',
300 }], 300 }],
301 ['target_arch=="ia32"', { 301 ['target_arch=="ia32"', {
302 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/de bian_wheezy_i386-sysroot', 302 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_wheezy _i386-sysroot',
303 }], 303 }],
304 ], 304 ],
305 }], # OS=="linux" and branding=="Chrome" and buildtype=="Official" and chromeos==0 305 }], # OS=="linux" and branding=="Chrome" and buildtype=="Official" and chromeos==0
306 306
307 ['OS=="linux" and target_arch=="mipsel"', { 307 ['OS=="linux" and target_arch=="mipsel"', {
308 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot', 308 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot',
309 }], 309 }],
310 ], 310 ],
311 }, 311 },
312 312
(...skipping 5884 matching lines...) Expand 10 before | Expand all | Expand 10 after
6197 # settings in target dicts. SYMROOT is a special case, because many other 6197 # settings in target dicts. SYMROOT is a special case, because many other
6198 # Xcode variables depend on it, including variables such as 6198 # Xcode variables depend on it, including variables such as
6199 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6199 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6200 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6200 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6201 # files to appear (when present) in the UI as actual files and not red 6201 # files to appear (when present) in the UI as actual files and not red
6202 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6202 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6203 # and therefore SYMROOT, needs to be set at the project level. 6203 # and therefore SYMROOT, needs to be set at the project level.
6204 'SYMROOT': '<(DEPTH)/xcodebuild', 6204 'SYMROOT': '<(DEPTH)/xcodebuild',
6205 }, 6205 },
6206 } 6206 }
OLDNEW
« no previous file with comments | « DEPS ('k') | build/config/sysroot.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698