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

Side by Side Diff: build/common.gypi

Issue 1131813002: Revert of Use Clang's update.py --print-revision everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | build/config/compiler/BUILD.gn » ('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 2607 matching lines...) Expand 10 before | Expand all | Expand 10 after
2618 'xcode_settings': { 2618 'xcode_settings': {
2619 'DYLIB_INSTALL_NAME_BASE': '@rpath', 2619 'DYLIB_INSTALL_NAME_BASE': '@rpath',
2620 'LD_RUNPATH_SEARCH_PATHS': [ 2620 'LD_RUNPATH_SEARCH_PATHS': [
2621 # For unbundled binaries. 2621 # For unbundled binaries.
2622 '@loader_path/.', 2622 '@loader_path/.',
2623 # For bundled binaries, to get back from Binary.app/Contents/MacOS. 2623 # For bundled binaries, to get back from Binary.app/Contents/MacOS.
2624 '@loader_path/../../..', 2624 '@loader_path/../../..',
2625 ], 2625 ],
2626 }, 2626 },
2627 }], 2627 }],
2628 ['clang==1 or host_clang==1', { 2628 ['(clang==1 or host_clang==1) and OS!="win"', {
2629 # This is here so that all files get recompiled after a clang roll and 2629 # This is here so that all files get recompiled after a clang roll and
2630 # when turning clang on or off. 2630 # when turning clang on or off.
2631 # (defines are passed via the command line, and build systems rebuild 2631 # (defines are passed via the command line, and build systems rebuild
2632 # things when their commandline changes). Nothing should ever read this 2632 # things when their commandline changes). Nothing should ever read this
2633 # define. 2633 # define.
2634 'defines': ['CR_CLANG_REVISION=<!(python <(DEPTH)/tools/clang/scripts/up date.py --print-revision)'], 2634 'defines': ['CR_CLANG_REVISION=<!(<(DEPTH)/tools/clang/scripts/update.sh --print-revision)'],
2635 }], 2635 }],
2636 ['enable_rlz==1', { 2636 ['enable_rlz==1', {
2637 'defines': ['ENABLE_RLZ'], 2637 'defines': ['ENABLE_RLZ'],
2638 }], 2638 }],
2639 ['component=="shared_library"', { 2639 ['component=="shared_library"', {
2640 'defines': ['COMPONENT_BUILD'], 2640 'defines': ['COMPONENT_BUILD'],
2641 }], 2641 }],
2642 ['toolkit_views==1', { 2642 ['toolkit_views==1', {
2643 'defines': ['TOOLKIT_VIEWS=1'], 2643 'defines': ['TOOLKIT_VIEWS=1'],
2644 }], 2644 }],
(...skipping 3539 matching lines...) Expand 10 before | Expand all | Expand 10 after
6184 # settings in target dicts. SYMROOT is a special case, because many other 6184 # settings in target dicts. SYMROOT is a special case, because many other
6185 # Xcode variables depend on it, including variables such as 6185 # Xcode variables depend on it, including variables such as
6186 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6186 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6187 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6187 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6188 # files to appear (when present) in the UI as actual files and not red 6188 # files to appear (when present) in the UI as actual files and not red
6189 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6189 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6190 # and therefore SYMROOT, needs to be set at the project level. 6190 # and therefore SYMROOT, needs to be set at the project level.
6191 'SYMROOT': '<(DEPTH)/xcodebuild', 6191 'SYMROOT': '<(DEPTH)/xcodebuild',
6192 }, 6192 },
6193 } 6193 }
OLDNEW
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698