| 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 # 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 614 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 625           'linux_breakpad%': 0, | 625           'linux_breakpad%': 0, | 
| 626           'linux_use_tcmalloc%': 0, | 626           'linux_use_tcmalloc%': 0, | 
| 627           # sysroot needs to be an absolute path otherwise it generates | 627           # sysroot needs to be an absolute path otherwise it generates | 
| 628           # incorrect results when passed to pkg-config | 628           # incorrect results when passed to pkg-config | 
| 629           'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot', | 629           'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot', | 
| 630         }], # OS=="linux" and target_arch=="arm" and chromeos==0 | 630         }], # OS=="linux" and target_arch=="arm" and chromeos==0 | 
| 631 | 631 | 
| 632         ['linux_lsb_release=="12.04"', { | 632         ['linux_lsb_release=="12.04"', { | 
| 633           'conditions': [ | 633           'conditions': [ | 
| 634             ['target_arch=="x64"', { | 634             ['target_arch=="x64"', { | 
| 635               'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/inte
      rnal/debian_wheezy_amd64-sysroot', | 635               'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debi
      an_wheezy_amd64-sysroot', | 
| 636             }], | 636             }], | 
| 637             ['target_arch=="ia32"', { | 637             ['target_arch=="ia32"', { | 
| 638               'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/inte
      rnal/debian_wheezy_i386-sysroot', | 638               'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debi
      an_wheezy_i386-sysroot', | 
| 639             }], | 639             }], | 
| 640         ], | 640         ], | 
| 641         }], # linux_lsb_release=="12.04" | 641         }], # linux_lsb_release=="12.04" | 
| 642 | 642 | 
| 643         ['target_arch=="mipsel"', { | 643         ['target_arch=="mipsel"', { | 
| 644           'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot', | 644           'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot', | 
| 645           'CXX%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/bin/mipsel-linux-gnu
      -gcc', | 645           'CXX%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/bin/mipsel-linux-gnu
      -gcc', | 
| 646         }], | 646         }], | 
| 647 | 647 | 
| 648         # Whether tests targets should be run, archived or just have the | 648         # Whether tests targets should be run, archived or just have the | 
| (...skipping 3864 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4513     # settings in target dicts.  SYMROOT is a special case, because many other | 4513     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 4514     # Xcode variables depend on it, including variables such as | 4514     # Xcode variables depend on it, including variables such as | 
| 4515     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 4515     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 4516     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4516     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 4517     # files to appear (when present) in the UI as actual files and not red | 4517     # files to appear (when present) in the UI as actual files and not red | 
| 4518     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4518     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 4519     # and therefore SYMROOT, needs to be set at the project level. | 4519     # and therefore SYMROOT, needs to be set at the project level. | 
| 4520     'SYMROOT': '<(DEPTH)/xcodebuild', | 4520     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 4521   }, | 4521   }, | 
| 4522 } | 4522 } | 
| OLD | NEW | 
|---|