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

Side by Side Diff: build/common.gypi

Issue 378183002: Revert r281914 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | 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 1759 matching lines...) Expand 10 before | Expand all | Expand 10 after
1770 'enable_mpeg2ts_stream_parser%': 1, 1770 'enable_mpeg2ts_stream_parser%': 1,
1771 'video_hole%': 1, 1771 'video_hole%': 1,
1772 }], 1772 }],
1773 ], 1773 ],
1774 }], 1774 }],
1775 ['android_webview_build==1', { 1775 ['android_webview_build==1', {
1776 # When building the WebView in the Android tree, jarjar will remap all 1776 # When building the WebView in the Android tree, jarjar will remap all
1777 # the class names, so the JNI generator needs to know this. 1777 # the class names, so the JNI generator needs to know this.
1778 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt' , 1778 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt' ,
1779 }], 1779 }],
1780 ['OS=="linux"', {
1781 # TODO(thakis): This is here to measure perf for a while.
1782 'clang%': 1,
1783 }], # OS=="mac"
1784 ['OS=="mac"', { 1780 ['OS=="mac"', {
1785 'conditions': [ 1781 'conditions': [
1786 # All Chrome builds have breakpad symbols, but only process the 1782 # All Chrome builds have breakpad symbols, but only process the
1787 # symbols from official builds. 1783 # symbols from official builds.
1788 ['(branding=="Chrome" and buildtype=="Official")', { 1784 ['(branding=="Chrome" and buildtype=="Official")', {
1789 'mac_strip_release%': 1, 1785 'mac_strip_release%': 1,
1790 }], 1786 }],
1791 ], 1787 ],
1792 }], # OS=="mac" 1788 }], # OS=="mac"
1793 ['OS=="mac" or OS=="ios"', { 1789 ['OS=="mac" or OS=="ios"', {
(...skipping 3820 matching lines...) Expand 10 before | Expand all | Expand 10 after
5614 # settings in target dicts. SYMROOT is a special case, because many other 5610 # settings in target dicts. SYMROOT is a special case, because many other
5615 # Xcode variables depend on it, including variables such as 5611 # Xcode variables depend on it, including variables such as
5616 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5612 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5617 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5613 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5618 # files to appear (when present) in the UI as actual files and not red 5614 # files to appear (when present) in the UI as actual files and not red
5619 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5615 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5620 # and therefore SYMROOT, needs to be set at the project level. 5616 # and therefore SYMROOT, needs to be set at the project level.
5621 'SYMROOT': '<(DEPTH)/xcodebuild', 5617 'SYMROOT': '<(DEPTH)/xcodebuild',
5622 }, 5618 },
5623 } 5619 }
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