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

Side by Side Diff: build/common.gypi

Issue 227133002: Revert "Turn on clang by default on linux." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clob Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('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 1592 matching lines...) Expand 10 before | Expand all | Expand 10 after
1603 'use_system_stlport%': '<(android_webview_build)', 1603 'use_system_stlport%': '<(android_webview_build)',
1604 1604
1605 # Copy it out one scope. 1605 # Copy it out one scope.
1606 'android_webview_build%': '<(android_webview_build)', 1606 'android_webview_build%': '<(android_webview_build)',
1607 }], # OS=="android" 1607 }], # OS=="android"
1608 ['android_webview_build==1', { 1608 ['android_webview_build==1', {
1609 # When building the WebView in the Android tree, jarjar will remap all 1609 # When building the WebView in the Android tree, jarjar will remap all
1610 # the class names, so the JNI generator needs to know this. 1610 # the class names, so the JNI generator needs to know this.
1611 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt' , 1611 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt' ,
1612 }], 1612 }],
1613 ['OS=="linux"', {
1614 # TODO(thakis): This is here to measure perf for a while.
1615 'clang%': 1,
1616 }], # OS=="mac"
1617 ['OS=="mac"', { 1613 ['OS=="mac"', {
1618 'conditions': [ 1614 'conditions': [
1619 # All Chrome builds have breakpad symbols, but only process the 1615 # All Chrome builds have breakpad symbols, but only process the
1620 # symbols from official builds. 1616 # symbols from official builds.
1621 ['(branding=="Chrome" and buildtype=="Official")', { 1617 ['(branding=="Chrome" and buildtype=="Official")', {
1622 'mac_strip_release%': 1, 1618 'mac_strip_release%': 1,
1623 }], 1619 }],
1624 ], 1620 ],
1625 }], # OS=="mac" 1621 }], # OS=="mac"
1626 ['OS=="mac" or OS=="ios"', { 1622 ['OS=="mac" or OS=="ios"', {
(...skipping 3590 matching lines...) Expand 10 before | Expand all | Expand 10 after
5217 # settings in target dicts. SYMROOT is a special case, because many other 5213 # settings in target dicts. SYMROOT is a special case, because many other
5218 # Xcode variables depend on it, including variables such as 5214 # Xcode variables depend on it, including variables such as
5219 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5215 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5220 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5216 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5221 # files to appear (when present) in the UI as actual files and not red 5217 # files to appear (when present) in the UI as actual files and not red
5222 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5218 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5223 # and therefore SYMROOT, needs to be set at the project level. 5219 # and therefore SYMROOT, needs to be set at the project level.
5224 'SYMROOT': '<(DEPTH)/xcodebuild', 5220 'SYMROOT': '<(DEPTH)/xcodebuild',
5225 }, 5221 },
5226 } 5222 }
OLDNEW
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698